diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-08-13 15:51:56 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-08-14 07:32:18 +0000 |
| commit | b4bd6eaf927d576612b47db40647180123b73cb9 (patch) | |
| tree | e76970e1a902babee906576efc908530bf40548f /cmake/QtBaseConfigureTests.cmake | |
| parent | 87078650a503477ddf63cf5656e4e82e9259ef56 (diff) | |
Export architecture config test variables
Export the architecture configuration variables from QtBase. There are
other modules that require access to this information in order to
enable certain features (e.g: qml_jit in QtDeclarative).
Change-Id: If2c7f29ccb1c0b0a0db3d78ad133a2a6be12b5ad
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtBaseConfigureTests.cmake')
| -rw-r--r-- | cmake/QtBaseConfigureTests.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/QtBaseConfigureTests.cmake b/cmake/QtBaseConfigureTests.cmake index 2787edaecd..ffa5019ca0 100644 --- a/cmake/QtBaseConfigureTests.cmake +++ b/cmake/QtBaseConfigureTests.cmake @@ -1,6 +1,6 @@ include(CheckCXXSourceCompiles) - function(run_config_test_architecture) + set(qt_base_configure_tests_vars_to_export) # Test architecture set(_arch_file "${CMAKE_CURRENT_BINARY_DIR}/architecture_test") try_compile(_arch_result "${CMAKE_CURRENT_BINARY_DIR}" @@ -38,12 +38,16 @@ function(run_config_test_architecture) set(TEST_architecture 1 CACHE INTERNAL "Ran the architecture test") set(TEST_architecture_arch "${_architecture}" CACHE INTERNAL "Target machine architecture") + list(APPEND qt_base_configure_tests_vars_to_export TEST_architecture_arch) set(TEST_subarch 1 CACHE INTERNAL "Ran machine subArchitecture test") foreach(it ${_sub_architecture}) # Equivalent to qmake's QT_CPU_FEATURES.$arch. set(TEST_arch_${TEST_architecture_arch}_subarch_${it} 1 CACHE INTERNAL "Target sub architecture result") + list(APPEND qt_base_configure_tests_vars_to_export TEST_arch_${TEST_architecture_arch}_subarch_${it}) endforeach() set(TEST_buildAbi "${_build_abi}" CACHE INTERNAL "Target machine buildAbi") + list(APPEND qt_base_configure_tests_vars_to_export TEST_buildAbi) + set(qt_base_configure_tests_vars_to_export ${qt_base_configure_tests_vars_to_export} CACHE INTERNAL "Test variables that should be exported") endfunction() |