diff options
| author | R. van Twisk <ries.van.twisk@ing.com> | 2019-12-27 22:31:59 +0100 |
|---|---|---|
| committer | R. van Twisk <ries.van.twisk@ing.com> | 2019-12-27 22:31:59 +0100 |
| commit | b84e9dfedbbd16470532312e16ee03c50453d438 (patch) | |
| tree | 5f94bf7707ea7a9b2ce62bf2c90cf1776ac83787 /cmake | |
| parent | eda539bf149534fd9b65e8da585b4b4cdac72ac1 (diff) | |
Add xplane and aruco
Add documentsion, source and xplane to DMG
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/opentrack-boilerplate.cmake | 2 | ||||
| -rw-r--r-- | cmake/opentrack-hier.cmake | 2 | ||||
| -rw-r--r-- | cmake/opentrack-platform.cmake | 7 |
3 files changed, 7 insertions, 4 deletions
diff --git a/cmake/opentrack-boilerplate.cmake b/cmake/opentrack-boilerplate.cmake index 7e9231ed..958403cc 100644 --- a/cmake/opentrack-boilerplate.cmake +++ b/cmake/opentrack-boilerplate.cmake @@ -224,7 +224,7 @@ function(otr_module n_) install(TARGETS "${n}" RUNTIME DESTINATION ${opentrack-hier-bin} BUNDLE DESTINATION ${opentrack-hier-bin} - LIBRARY DESTINATION ${opentrack-hier-bin}/opentrack.app/Contents/MacOS/ + LIBRARY DESTINATION ${opentrack-hier-bin}/Library RESOURCE DESTINATION ${opentrack-hier-bin}/opentrack.app/Resource PERMISSIONS ${opentrack-perms-exec}) else() diff --git a/cmake/opentrack-hier.cmake b/cmake/opentrack-hier.cmake index c94c6d57..8e9e3db8 100644 --- a/cmake/opentrack-hier.cmake +++ b/cmake/opentrack-hier.cmake @@ -18,7 +18,7 @@ if(APPLE) set(opentrack-doc-src-pfx "./source-code") set(opentrack-i18n-pfx "opentrack.app/Contents/Resources") # used during install set(opentrack-i18n-path "../Resources/i18n") # used in application - set(opentrack-install-rpath "./") + set(opentrack-install-rpath "../Frameworks") set(opentrack-hier-str RUNTIME DESTINATION ${opentrack-hier-pfx} LIBRARY DESTINATION ${opentrack-hier-pfx}) elseif(WIN32) set(opentrack-hier-pfx "modules") diff --git a/cmake/opentrack-platform.cmake b/cmake/opentrack-platform.cmake index 35de63a4..bb7fb1f8 100644 --- a/cmake/opentrack-platform.cmake +++ b/cmake/opentrack-platform.cmake @@ -43,11 +43,15 @@ set(CMAKE_CXX_STANDARD_DEFAULT 17) set(CMAKE_CXX_STANDARD_REQUIRED TRUE) set(CMAKE_CXX_EXTENSIONS FALSE) -IF (NOT APPLE) +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) +else() + set(CMAKE_SKIP_BUILD_RPATH FALSE) + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + set(CMAKE_MACOSX_RPATH OFF) endif() set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC OFF) @@ -56,7 +60,6 @@ set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) set(CMAKE_C_VISIBILITY_PRESET hidden) set(CMAKE_CXX_VISIBILITY_PRESET hidden) -set(CMAKE_MACOSX_RPATH OFF) if(NOT WIN32 AND NOT APPLE) include(opentrack-pkg-config) |