diff options
| author | R. van Twisk <ries.van.twisk@ing.com> | 2019-12-19 21:07:19 +0100 |
|---|---|---|
| committer | R. van Twisk <ries.van.twisk@ing.com> | 2019-12-19 21:07:19 +0100 |
| commit | 96316119fd57b1d5acdfc0ff51e1766a9311f11f (patch) | |
| tree | d4f82397cbfc4427b39901023cc350ac9673965f /cmake/opentrack-platform.cmake | |
| parent | 8d29288ecd592bae5b0bc2951cd44c7400e36654 (diff) | |
Fix bundle creation OSX
Diffstat (limited to 'cmake/opentrack-platform.cmake')
| -rw-r--r-- | cmake/opentrack-platform.cmake | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index 0ebe53a7..35de63a4 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -43,10 +43,12 @@ set(CMAKE_CXX_STANDARD_DEFAULT 17) set(CMAKE_CXX_STANDARD_REQUIRED TRUE) set(CMAKE_CXX_EXTENSIONS FALSE) -set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) -set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -set(CMAKE_SKIP_INSTALL_RPATH FALSE) -set(CMAKE_SKIP_RPATH FALSE) +IF (NOT APPLE) + set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + set(CMAKE_SKIP_INSTALL_RPATH FALSE) + set(CMAKE_SKIP_RPATH FALSE) +endif() set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC OFF) set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) @@ -155,16 +157,6 @@ if(MSVC) endforeach() endif() -if(APPLE) - # Removed because of Macro error - # add_compile_definitions(-stdlib=libc++) - add_link_options(-stdlib=libc++) - - # Build failure cannot link to frameworks - #add_link_options(-framework Cocoa -framework CoreFoundation -framework Carbon) - #link_libraries(objc z) -endif() - if(NOT MSVC) include(FindPkgConfig) endif() |