diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/opentrack-platform.cmake | 7 | ||||
| -rw-r--r-- | cmake/opentrack-qt.cmake | 1 | ||||
| -rw-r--r-- | cmake/opentrack-word-size.cmake | 8 |
3 files changed, 7 insertions, 9 deletions
diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index 1bb0a973..2df0bfe0 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -114,10 +114,13 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) include_directories("${CMAKE_SOURCE_DIR}") -if(CMAKE_COMPILER_IS_GNUCXX AND UNIX AND (NOT APPLE)) +if(CMAKE_COMPILER_IS_GNUCXX AND UNIX) set(_common "-fvisibility=hidden") set(CMAKE_C_FLAGS "${_common} ${CMAKE_C_FLAGS}") - set(CMAKE_CXX_FLAGS "${_common} -fuse-cxa-atexit ${CMAKE_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS "${_common} ${CMAKE_CXX_FLAGS}") + if(NOT APPLE) + set(CMAKE_CXX_FLAGS "-fuse-cxa-atexit ${CMAKE_CXX_FLAGS}") + endif() endif() if(APPLE) diff --git a/cmake/opentrack-qt.cmake b/cmake/opentrack-qt.cmake index a5f2b0f2..8d975712 100644 --- a/cmake/opentrack-qt.cmake +++ b/cmake/opentrack-qt.cmake @@ -61,4 +61,5 @@ function(otr_qt n) include_directories(SYSTEM ${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS}) add_definitions(${Qt5Core_DEFINITIONS} ${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS}) add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) + add_definitions(-DQT_DEPRECATED -DQT_DISABLE_DEPRECATED_BEFORE=-1) endfunction() diff --git a/cmake/opentrack-word-size.cmake b/cmake/opentrack-word-size.cmake index 12c34066..4ed82e02 100644 --- a/cmake/opentrack-word-size.cmake +++ b/cmake/opentrack-word-size.cmake @@ -1,10 +1,4 @@ -include(CheckTypeSize)
-check_type_size(void* opentrack-word-size BUILTIN_TYPES_ONLY LANGUAGE C)
-if(NOT ((opentrack-word-size EQUAL 4) OR (opentrack-word-size EQUAL 8)))
- message(FATAL_ERROR "word size '${opentrack-word-size}' either misdetected or really not 4 or 8")
-endif()
-set(opentrack-word-size ${opentrack-word-size})
-if(opentrack-word-size GREATER 4)
+if(CMAKE_SIZEOF_VOID_P GREATER 4)
set(opentrack-64bit TRUE)
else()
set(opentrack-64bit FALSE)
|