diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2016-07-07 11:41:27 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2016-07-07 11:41:27 +0200 |
| commit | b2c5d21f08c39bb69fbcaedc5547b811ec1b7cc6 (patch) | |
| tree | 5cf4830de6a3da853781842e1311cae144c000be /cmake | |
| parent | 3e41fcf185f26a55af539278bd4fbd461a699f02 (diff) | |
cmake: force 64-bit build on OSX unconditionally
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/apple.cmake | 1 | ||||
| -rw-r--r-- | cmake/opentrack-build.cmake | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/cmake/apple.cmake b/cmake/apple.cmake index 3db8e3ef..d3cc41eb 100644 --- a/cmake/apple.cmake +++ b/cmake/apple.cmake @@ -15,7 +15,6 @@ set(CMAKE_EXE_LINKER_FLAGS_RELEASE "-flto" CACHE STRING "" FORCE) set(CMAKE_SHARED_LINKER_FLAGS_RELEASE ${CMAKE_EXE_LINKER_FLAGS_RELEASE} CACHE STRING "" FORCE) set(CMAKE_MODULE_LINKER_FLAGS_RELEASE ${CMAKE_EXE_LINKER_FLAGS_RELEASE} CACHE STRING "" FORCE) -set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "" FORCE) set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8" CACHE STRING "" FORCE) set(OpenCV_DIR ~/dev/opentrack-depends/opencv/build) diff --git a/cmake/opentrack-build.cmake b/cmake/opentrack-build.cmake index 6f23f561..a6cdcda3 100644 --- a/cmake/opentrack-build.cmake +++ b/cmake/opentrack-build.cmake @@ -3,3 +3,7 @@ if(NOT CMAKE_INSTALL_PREFIX) endif() set(CMAKE_BUILD_TYPE_INIT "RELEASE") + +if(APPLE) + set(CMAKE_OSX_ARCHITECTURES "x86_64" CACHE STRING "" FORCE) +endif() |