diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-18 14:35:40 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-18 16:25:40 +0000 |
commit | 3b673994ea0311616db7022cef859705e25cdfab (patch) | |
tree | 7e637d7c5df75f121fce53ac8aeb59178e21981c /tests/auto/.prev_CMakeLists.txt | |
parent | d9a3e03934076aea8852f1c4b142a5ecfeea0297 (diff) |
CMake: Regenerate projects after mergewip/cmake
Plus additional adjustments.
Change-Id: I0c2341ef6a5557e18df91b753f9e441c5b1a68e2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/.prev_CMakeLists.txt')
-rw-r--r-- | tests/auto/.prev_CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt index 5eae3760b..bdf5c6b16 100644 --- a/tests/auto/.prev_CMakeLists.txt +++ b/tests/auto/.prev_CMakeLists.txt @@ -1,14 +1,14 @@ # Generated from auto.pro. -if(QT_FEATURE_process AND NOT CMAKE_CROSS_COMPILING) +if(QT_FEATURE_process AND NOT CMAKE_CROSSCOMPILING) add_subdirectory(linguist) add_subdirectory(qtattributionsscanner) add_subdirectory(qtdiag) endif() -if(NOT CMAKE_CROSS_COMPILING) +if(NOT CMAKE_CROSSCOMPILING) add_subdirectory(qdoc) endif() -if(TARGET Qt::Help AND NOT CMAKE_CROSS_COMPILING) +if(TARGET Qt::Help AND NOT CMAKE_CROSSCOMPILING) add_subdirectory(qhelpcontentmodel) add_subdirectory(qhelpenginecore) add_subdirectory(qhelpgenerator) @@ -17,6 +17,6 @@ if(TARGET Qt::Help AND NOT CMAKE_CROSS_COMPILING) endif() add_subdirectory(cmake) add_subdirectory(installed_cmake) -if(QT_FEATURE_process AND WIN32 AND NOT CMAKE_CROSS_COMPILING AND NOT WINRT) +if(QT_FEATURE_process AND WIN32 AND NOT CMAKE_CROSSCOMPILING AND NOT WINRT) add_subdirectory(windeployqt) endif() |