diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/tools/CMakeLists.txt | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt index d6ef4f3a56..56b81bb7af 100644 --- a/src/3rdparty/CMakeLists.txt +++ b/src/3rdparty/CMakeLists.txt @@ -1,17 +1,17 @@ # special case skip regeneration # The file is maintained manually -if(QT_FEATURE_png AND NOT QT_FEATURE_system_png) +if(QT_FEATURE_gui AND QT_FEATURE_png AND NOT QT_FEATURE_system_png) add_subdirectory(libpng) endif() qt_install_3rdparty_library_wrap_config_extra_file(BundledLibpng) -if(QT_FEATURE_freetype AND NOT QT_FEATURE_system_freetype) +if(QT_FEATURE_gui AND QT_FEATURE_freetype AND NOT QT_FEATURE_system_freetype) add_subdirectory(freetype) endif() qt_install_3rdparty_library_wrap_config_extra_file(BundledFreetype) -if(QT_FEATURE_harfbuzz AND NOT QT_FEATURE_system_harfbuzz) +if(QT_FEATURE_gui AND QT_FEATURE_harfbuzz AND NOT QT_FEATURE_system_harfbuzz) add_subdirectory(harfbuzz-ng) endif() qt_install_3rdparty_library_wrap_config_extra_file(BundledHarfbuzz) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e0d2c0180e..78ee63baae 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,8 +5,12 @@ # should be built. # The order of evaluation matters. qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/corelib/configure.cmake") -qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/network/configure.cmake") -qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/gui/configure.cmake") +if(QT_FEATURE_network) + qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/network/configure.cmake") +endif() +if(QT_FEATURE_gui) + qt_feature_evaluate_features("${CMAKE_CURRENT_SOURCE_DIR}/gui/configure.cmake") +endif() add_subdirectory(3rdparty) diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt index 425a99b552..463f8bcc5b 100644 --- a/src/tools/CMakeLists.txt +++ b/src/tools/CMakeLists.txt @@ -9,5 +9,7 @@ add_subdirectory(qvkgen) # Only include the following tools when performing a host build if(NOT CMAKE_CROSSCOMPILING) add_subdirectory(androiddeployqt) - add_subdirectory(androidtestrunner) + if(QT_FEATURE_gui) + add_subdirectory(androidtestrunner) + endif() endif() |