Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-05-27 09:56:14 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2021-06-09 17:05:15 +0200
commitf8a891f3d2b833747d575d92de99dfb27396a355 (patch)
treededeabfc5c01ed198549d493cbb91461b04d87a1 /sources/cmake_helpers/helpers.cmake
parent77669e48fd8ac0f4ca199173672c4bf0c9dc654b (diff)
Use conditional processing in the type system
In CMake, remove the AUTO_OS variable from the check_os() macro. Fold the macOS/X11 type system files of Qt Core into the common type system file. Task-number: PYSIDE-802 Task-number: PYSIDE-1568 Change-Id: Ib751f40fbf7eca8fe4d08270db4fbc1e938323c5 Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/cmake_helpers/helpers.cmake')
-rw-r--r--sources/cmake_helpers/helpers.cmake6
1 files changed, 1 insertions, 5 deletions
diff --git a/sources/cmake_helpers/helpers.cmake b/sources/cmake_helpers/helpers.cmake
index b7c498637..beba25c74 100644
--- a/sources/cmake_helpers/helpers.cmake
+++ b/sources/cmake_helpers/helpers.cmake
@@ -64,14 +64,10 @@ set(ENABLE_WIN "0")
if(CMAKE_HOST_APPLE)
set(ENABLE_MAC "1")
- set(AUTO_OS "mac")
elseif(CMAKE_HOST_WIN32)
set(ENABLE_WIN "1")
set(ENABLE_UNIX "0")
- set(AUTO_OS "win")
-elseif(CMAKE_HOST_UNIX)
- set(AUTO_OS "x11")
-else()
+elseif(NOT CMAKE_HOST_UNIX)
message(FATAL_ERROR "OS not supported")
endif()
endmacro()