diff options
-rw-r--r-- | tests/auto/cmake/test_QTBUG-63422/CMakeLists.txt | 3 | ||||
-rw-r--r-- | tests/auto/cmake/test_interface/CMakeLists.txt | 3 | ||||
-rw-r--r-- | tests/auto/cmake/test_moc_macro_target/CMakeLists.txt | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/cmake/test_QTBUG-63422/CMakeLists.txt b/tests/auto/cmake/test_QTBUG-63422/CMakeLists.txt index a0b82caee4..b9b9756699 100644 --- a/tests/auto/cmake/test_QTBUG-63422/CMakeLists.txt +++ b/tests/auto/cmake/test_QTBUG-63422/CMakeLists.txt @@ -1,6 +1,9 @@ cmake_minimum_required(VERSION 2.8) project(test_dependent_modules) +# Need to set the policy to link to qtmain.lib automatically. +cmake_policy(SET CMP0020 NEW) + find_package(Qt5Widgets REQUIRED) set(CMAKE_AUTOMOC ON) diff --git a/tests/auto/cmake/test_interface/CMakeLists.txt b/tests/auto/cmake/test_interface/CMakeLists.txt index 2af80ea448..fdd1aacc10 100644 --- a/tests/auto/cmake/test_interface/CMakeLists.txt +++ b/tests/auto/cmake/test_interface/CMakeLists.txt @@ -25,6 +25,9 @@ int main(int,char**) { QWidget w; w.show(); return 0; } " ) +# Fix try_compile to inherit the parent configuration. +set(CMAKE_TRY_COMPILE_CONFIGURATION "${CMAKE_BUILD_TYPE}") + # The try_compile works because Qt5::Widgets is listed in the LINK_LIBRARIES, # which causes the includes, defines and appropriate PIC flag to be used. try_compile(_TRY_COMPILE_RES "${CMAKE_CURRENT_BINARY_DIR}/try_compile-test" diff --git a/tests/auto/cmake/test_moc_macro_target/CMakeLists.txt b/tests/auto/cmake/test_moc_macro_target/CMakeLists.txt index e97ac199e8..f3299060fd 100644 --- a/tests/auto/cmake/test_moc_macro_target/CMakeLists.txt +++ b/tests/auto/cmake/test_moc_macro_target/CMakeLists.txt @@ -11,13 +11,13 @@ qt5_generate_moc(main_gen_test.cpp "${CMAKE_CURRENT_BINARY_DIR}/main_gen_test.moc" TARGET Qt5GenerateMacroTest ) -add_executable(Qt5GenerateMacroTest WIN32 main_gen_test.cpp "${CMAKE_CURRENT_BINARY_DIR}/main_gen_test.moc") +add_executable(Qt5GenerateMacroTest main_gen_test.cpp "${CMAKE_CURRENT_BINARY_DIR}/main_gen_test.moc") target_include_directories(Qt5GenerateMacroTest PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/interface") target_link_libraries(Qt5GenerateMacroTest Qt5::Core) qt5_wrap_cpp(moc_file mywrapobject.h TARGET Qt5WrapMacroTest ) -add_executable(Qt5WrapMacroTest WIN32 main_wrap_test.cpp ${moc_file}) +add_executable(Qt5WrapMacroTest main_wrap_test.cpp ${moc_file}) target_include_directories(Qt5WrapMacroTest PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/interface") target_link_libraries(Qt5WrapMacroTest Qt5::Core) |