diff options
| author | Marianne Yrjänä <marianne.yrjana@qt.io> | 2020-11-20 11:20:29 +0200 |
|---|---|---|
| committer | Marianne Yrjänä <marianne.yrjana@qt.io> | 2020-11-20 15:28:31 +0200 |
| commit | 703485c29331fb72b0160914dd66a91ae2b403c4 (patch) | |
| tree | da5dc3bf0c5b87713740f244b972da127b0dbb80 /cmake | |
| parent | ce29ce586f06f56a66198b934f8860946380e26e (diff) | |
QNX7.1 updates
Updates due to newer compiler version in QNX7.1
Task-number: QTBUG-88300
Change-Id: If9bbc08d49a077d80174a1807e069b5d4ef61c0d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtCompilerOptimization.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 5c03c433e3..e62294c045 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -326,7 +326,7 @@ elseif(QNX) set(compiler_x86-64 x86_64) set(compiler_x86 x86) foreach(arch aarch64le armle-v7 x86-64 x86) - if (CMAKE_CXX_COMPILER_TARGET MATCHES "${compiler_${arch}}") + if (CMAKE_CXX_COMPILER_TARGET MATCHES "${compiler_${arch}}$") set(QT_DEFAULT_MKSPEC qnx-${arch}-qcc) endif() endforeach() diff --git a/cmake/QtCompilerOptimization.cmake b/cmake/QtCompilerOptimization.cmake index 333cbf3f15..ed6921da53 100644 --- a/cmake/QtCompilerOptimization.cmake +++ b/cmake/QtCompilerOptimization.cmake @@ -6,6 +6,7 @@ if (QCC) set(QT_CFLAGS_SSE4_2 "-msse4.2") set(QT_CFLAGS_AVX "-mavx") set(QT_CFLAGS_AVX2 "-mavx2") + set(QT_CFLAGS_ARCH_HASWELL "-march=haswell") set(QT_CFLAGS_AESNI "-maes") set(QT_CFLAGS_SHANI "-msha") endif() |