Cmake export tests: Added testcases for erroneous xhtml exports

[lyx.git] / development / cmake / ConfigureChecks.cmake

diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake
index 46ee11fcbc9a52be682ccfec782a1afba1cae7cb..2de915f7e701558212f0859f1de970144188b952 100644 (file)
--- a/development/cmake/ConfigureChecks.cmake
+++ b/development/cmake/ConfigureChecks.cmake
@@ -114,6 +114,13 @@ check_cxx_source_compiles(
        "
 SIZEOF_WCHAR_T_IS_4)
 
+check_cxx_source_compiles(
+       "
+       int i[ ( sizeof(long long)>sizeof(long) ? 1 : -1 ) ];
+       int main(){return 0;}
+       "
+SIZEOF_LONG_LONG_GREATER_THAN_SIZEOF_LONG)
+
 check_cxx_source_compiles(
        "
        #include <execinfo.h>
@@ -185,7 +192,10 @@ if(LYX_USE_QT MATCHES "QT5")
     get_target_property(_x11extra_link_libraries Qt5::X11Extras IMPORTED_LOCATION_${_x11extra_prop})
     set(CMAKE_REQUIRED_LIBRARIES ${_x11extra_link_libraries})
     set(CMAKE_REQUIRED_INCLUDES ${Qt5X11Extras_INCLUDE_DIRS})
-    set(CMAKE_REQUIRED_FLAGS ${Qt5X11Extras_EXECUTABLE_COMPILE_FLAGS})
+    set(CMAKE_REQUIRED_FLAGS "${Qt5X11Extras_EXECUTABLE_COMPILE_FLAGS} -fPIC -DQT_NO_VERSION_TAGGING")
+    #message(STATUS "CMAKE_REQUIRED_LIBRARIES = ${_x11extra_link_libraries}")
+    #message(STATUS "CMAKE_REQUIRED_INCLUDES = ${Qt5X11Extras_INCLUDE_DIRS}")
+    #message(STATUS "CMAKE_REQUIRED_FLAGS = ${CMAKE_REQUIRED_FLAGS}")
     check_cxx_source_compiles(
             "
             #include <QtX11Extras/QX11Info>
@@ -198,7 +208,8 @@ if(LYX_USE_QT MATCHES "QT5")
   endif()
   if (Qt5WinExtras_FOUND)
     get_target_property(_winextra_prop Qt5::WinExtras IMPORTED_CONFIGURATIONS)
-    get_target_property(_winextra_link_libraries Qt5::WinExtras IMPORTED_LOCATION_${_winextra_prop})
+    string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE)
+    get_target_property(_winextra_link_libraries Qt5::WinExtras IMPORTED_LOCATION_${BUILD_TYPE})
     set(CMAKE_REQUIRED_LIBRARIES ${_winextra_link_libraries})
     set(CMAKE_REQUIRED_INCLUDES ${Qt5WinExtras_INCLUDE_DIRS})
     set(CMAKE_REQUIRED_FLAGS ${Qt5WinExtras_EXECUTABLE_COMPILE_FLAGS})