diff options
Diffstat (limited to 'cmake/QtProcessConfigureArgs.cmake')
| -rw-r--r-- | cmake/QtProcessConfigureArgs.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index 8d4cef232b..0f13a6886f 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -28,8 +28,10 @@ endmacro() if("${MODULE_ROOT}" STREQUAL "") # If MODULE_ROOT is not set, assume that we want to build qtbase or top-level. get_filename_component(MODULE_ROOT ".." ABSOLUTE BASE_DIR "${CMAKE_CURRENT_LIST_DIR}") + set(auto_detect_generator TRUE) else() file(TO_CMAKE_PATH "${MODULE_ROOT}" MODULE_ROOT) + set(auto_detect_generator FALSE) endif() set(configure_filename "configure.cmake") set(commandline_filename "qt_cmdline.cmake") @@ -54,7 +56,6 @@ list(FILTER configure_args EXCLUDE REGEX "^[ \t]*$") list(TRANSFORM configure_args STRIP) list(TRANSFORM configure_args REPLACE "\\\\" "\\\\\\\\") unset(generator) -set(auto_detect_generator TRUE) set(auto_detect_compiler TRUE) unset(device_options) set_property(GLOBAL PROPERTY UNHANDLED_ARGS "") |