summaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtProcessConfigureArgs.cmake12
1 files changed, 7 insertions, 5 deletions
diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake
index 9a6370cca2..7e3f789a7c 100644
--- a/cmake/QtProcessConfigureArgs.cmake
+++ b/cmake/QtProcessConfigureArgs.cmake
@@ -526,11 +526,6 @@ macro(translate_list_input name cmake_var)
endif()
endmacro()
-foreach(feature ${commandline_known_features})
- qt_feature_normalize_name("${feature}" cmake_feature)
- translate_boolean_input(${feature} FEATURE_${cmake_feature})
-endforeach()
-
translate_boolean_input(precompile_header BUILD_WITH_PCH)
translate_boolean_input(ccache QT_USE_CCACHE)
translate_boolean_input(shared BUILD_SHARED_LIBS)
@@ -607,6 +602,13 @@ translate_list_input(includes QT_EXTRA_INCLUDEPATHS)
translate_list_input(lpaths QT_EXTRA_LIBDIRS)
translate_list_input(rpaths QT_EXTRA_RPATHS)
+foreach(feature ${commandline_known_features})
+ qt_feature_normalize_name("${feature}" cmake_feature)
+ if(${feature} IN_LIST config_inputs)
+ translate_boolean_input(${feature} FEATURE_${cmake_feature})
+ endif()
+endforeach()
+
foreach(input ${config_inputs})
push("-DINPUT_${input}=${INPUT_${input}}")
endforeach()