diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2019-03-12 21:55:58 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-03-18 12:33:44 +0000 |
commit | 64147fcb3380244c0dcf744dc84f31ec917cc608 (patch) | |
tree | 5d45d5c9c51fd869fd27da4436d9c7b751510c37 /cmake | |
parent | fbf98bf255e2fe134c3274e314b945097e2905e4 (diff) |
CMake: Add QT_CFLAGS_* when building x86simd tests
Change-Id: I5caa088d517cb9d3749c3ed8ef88a41552c1d340
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r-- | cmake/QtFeature.cmake | 13 | ||||
-rw-r--r-- | cmake/QtPlatformSupport.cmake | 1 |
2 files changed, 7 insertions, 7 deletions
diff --git a/cmake/QtFeature.cmake b/cmake/QtFeature.cmake index 87fe4a55dd..030bcd90c9 100644 --- a/cmake/QtFeature.cmake +++ b/cmake/QtFeature.cmake @@ -413,17 +413,16 @@ function(qt_config_compile_test name) endfunction() function(qt_config_compile_test_x86simd extension label) - string(TOUPPER ${extension} extension_uppercase) if (DEFINED TEST_X86SIMD_${extension}) return() endif() - try_compile(TEST_X86SIMD_${extension} "${CMAKE_CURRENT_BINARY_DIR}" - "${CMAKE_CURRENT_SOURCE_DIR}/config.tests/x86_simd/main.cpp" - COMPILE_DEFINITIONS -DQT_COMPILER_SUPPORTS_${extension_uppercase} - OUTPUT_VARIABLE foo - ) - set(TEST_subarch_${extension} "${TEST_X86SIMD_${extension}}" CACHE INTERNAL "${label}" ) + try_compile("TEST_X86SIMD_${extension}" + "${CMAKE_CURRENT_BINARY_DIR}/config.tests/x86_simd_${extension}" + "${CMAKE_CURRENT_SOURCE_DIR}/config.tests/x86_simd" + x86_simd + CMAKE_FLAGS "-DSIMD:string=${extension}") + set(TEST_subarch_${extension} "${TEST_X86SIMD_${extension}}" CACHE INTERNAL "${label}") endfunction() function(qt_make_features_available target) diff --git a/cmake/QtPlatformSupport.cmake b/cmake/QtPlatformSupport.cmake index 4f3103e304..45479a3a7e 100644 --- a/cmake/QtPlatformSupport.cmake +++ b/cmake/QtPlatformSupport.cmake @@ -33,6 +33,7 @@ set01(ANDROID_EMBEDDED ANDROID) # FIXME: How to identify this? set01(GCC CMAKE_CXX_COMPILER_ID STREQUAL "GNU") set01(CLANG CMAKE_CXX_COMPILER_ID MATCHES "Clang") set01(ICC CMAKE_C_COMPILER MATCHES "icc|icl") +set01(QCC CMAKE_C_COMPILER MATCHES "qcc") # FIXME: How to identify this? if(CMAKE_SIZEOF_VOID_P EQUAL 8) set(QT_64BIT TRUE) |