ConfigureBuildQt: Add CMAKE_GENERATOR option to standalone parts
Also `configure_qt` did not have `CMAKE_GENERATOR` defined in the args. Change-Id: I84a2aed1b992d8169d92fe727094708d8bd447b0 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
parent
f7af48b07e
commit
1cef8ec34c
@ -488,6 +488,7 @@ function(configure_qt)
|
|||||||
)
|
)
|
||||||
set(single_args
|
set(single_args
|
||||||
TEST_NAME
|
TEST_NAME
|
||||||
|
CMAKE_GENERATOR
|
||||||
BUILD_DIR_ROOT_PATH
|
BUILD_DIR_ROOT_PATH
|
||||||
REPO_NAME
|
REPO_NAME
|
||||||
REPO_PATH
|
REPO_PATH
|
||||||
@ -609,6 +610,7 @@ function(configure_standalone_part)
|
|||||||
)
|
)
|
||||||
set(single_args
|
set(single_args
|
||||||
TEST_NAME
|
TEST_NAME
|
||||||
|
CMAKE_GENERATOR
|
||||||
BUILD_DIR_ROOT_PATH
|
BUILD_DIR_ROOT_PATH
|
||||||
REPO_NAME
|
REPO_NAME
|
||||||
REPO_PATH
|
REPO_PATH
|
||||||
@ -689,6 +691,11 @@ function(configure_standalone_part)
|
|||||||
-B .
|
-B .
|
||||||
)
|
)
|
||||||
get_common_cmake_args(common_cmake_args)
|
get_common_cmake_args(common_cmake_args)
|
||||||
|
if(arg_CMAKE_GENERATOR)
|
||||||
|
list(APPEND common_cmake_args -G "${arg_CMAKE_GENERATOR}")
|
||||||
|
else()
|
||||||
|
list(APPEND common_cmake_args -G "${RunCMake_GENERATOR}")
|
||||||
|
endif()
|
||||||
list(APPEND common_cmake_args
|
list(APPEND common_cmake_args
|
||||||
${arg_CMAKE_ARGS}
|
${arg_CMAKE_ARGS}
|
||||||
)
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user