diff options
| -rw-r--r-- | cmake/QtCompilerOptimization.cmake | 12 | ||||
| -rw-r--r-- | cmake/QtPlatformSupport.cmake | 2 | ||||
| -rw-r--r-- | cmake/QtTestHelpers.cmake | 2 |
3 files changed, 1 insertions, 15 deletions
diff --git a/cmake/QtCompilerOptimization.cmake b/cmake/QtCompilerOptimization.cmake index f2ae3c3143..19504c84fb 100644 --- a/cmake/QtCompilerOptimization.cmake +++ b/cmake/QtCompilerOptimization.cmake @@ -73,18 +73,6 @@ if(GCC OR CLANG) set(QT_CFLAGS_MIPS_DSPR2 "-mdspr2") endif() -if (winrt) # FIXME: Correct variable - set(QT_CFLAGS_SSE2 "-arch:SSE2") - set(QT_CFLAGS_SSE3 "-arch:SSE2") - set(QT_CFLAGS_SSSE3 "-arch:SSE2") - set(QT_CFLAGS_SSE4_1 "-arch:SSE2") - set(QT_CFLAGS_SSE4_2 "-arch:SSE2") - set(QT_CFLAGS_AVX "-arch:AVX") - set(QT_CFLAGS_AVX2 "-arch:AVX") - set(QT_CFLAGS_AESNI "-arch:SSE2") - set(QT_CFLAGS_SHANI "-arch:SSE2") -endif() - # Fall through is important, so that more specific flags that might be missing are set by the # previous base cases. # This mirrors qmake's mkspecs QMAKE_CFLAGS_OPTIMIZE assignments (mostly). diff --git a/cmake/QtPlatformSupport.cmake b/cmake/QtPlatformSupport.cmake index 11b316419a..f39bf0e780 100644 --- a/cmake/QtPlatformSupport.cmake +++ b/cmake/QtPlatformSupport.cmake @@ -21,8 +21,6 @@ qt_set01(SOLARIS CMAKE_SYSTEM_NAME STREQUAL "SunOS") qt_set01(BSD APPLE OR OPENBSD OR FREEBSD OR NETBSD) -qt_set01(WINRT WIN32 AND CMAKE_VS_PLATFORM_TOOSLET STREQUAL "winrt") # FIXME: How to identify this? - qt_set01(IOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "iOS") qt_set01(TVOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "tvOS") qt_set01(WATCHOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "watchOS") diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake index 58742537aa..6c9ecba069 100644 --- a/cmake/QtTestHelpers.cmake +++ b/cmake/QtTestHelpers.cmake @@ -349,7 +349,7 @@ function(qt_internal_add_test name) endif() endif() - if(ANDROID OR IOS OR WINRT) + if(ANDROID OR IOS) set(builtin_testdata TRUE) endif() |