summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt1
-rw-r--r--cmake/opentrack-platform.cmake6
-rw-r--r--cmake/opentrack-word-size.cmake6
3 files changed, 6 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b2bbb12f..5be882d3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,6 @@ set_property(GLOBAL PROPERTY opentrack-all-source-dirs "")
set(opentrack_all-translations "nl_NL;ru_RU;stub;zh_CN")
-include(opentrack-word-size)
include(opentrack-hier)
include(opentrack-platform)
include(opentrack-i18n)
diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake
index 8cc7d346..64b9fe4d 100644
--- a/cmake/opentrack-platform.cmake
+++ b/cmake/opentrack-platform.cmake
@@ -39,6 +39,12 @@ else()
set(opentrack-intel FALSE)
endif()
+if(CMAKE_SIZEOF_VOID_P GREATER_EQUAL 8)
+ set(opentrack-64bit TRUE)
+else()
+ set(opentrack-64bit FALSE)
+endif()
+
if(APPLE)
if(NOT CMAKE_OSX_ARCHITECTURES)
set(CMAKE_OSX_ARCHITECTURES "x86_64")
diff --git a/cmake/opentrack-word-size.cmake b/cmake/opentrack-word-size.cmake
deleted file mode 100644
index e539f1cd..00000000
--- a/cmake/opentrack-word-size.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-include_guard(GLOBAL)
-if(CMAKE_SIZEOF_VOID_P GREATER 4)
- set(opentrack-64bit TRUE)
-else()
- set(opentrack-64bit FALSE)
-endif()