diff options
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | cmake/opentrack-boilerplate.cmake | 3 | ||||
| -rw-r--r-- | cmake/opentrack-hier.cmake | 4 | ||||
| -rw-r--r-- | cmake/opentrack-install.cmake | 26 | ||||
| -rwxr-xr-x | macosx/make-app-bundle.sh | 1 |
5 files changed, 2 insertions, 33 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 448d7667..337d8072 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,7 +108,6 @@ otr_add_subdirs() otr_merge_translations() include(opentrack-install) -otr_install_sources() string(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE) message(STATUS "-- Compile flags:") diff --git a/cmake/opentrack-boilerplate.cmake b/cmake/opentrack-boilerplate.cmake index a78e0ed0..34721b02 100644 --- a/cmake/opentrack-boilerplate.cmake +++ b/cmake/opentrack-boilerplate.cmake @@ -235,7 +235,8 @@ function(otr_module n_) endif() else() # Plugins - install(TARGETS "${n}" ${opentrack-install-src} + install(TARGETS "${n}" + RUNTIME DESTINATION ${opentrack-libexec} PERMISSIONS ${opentrack-perms-exec}) endif() diff --git a/cmake/opentrack-hier.cmake b/cmake/opentrack-hier.cmake index 6c4827e0..0d558d0d 100644 --- a/cmake/opentrack-hier.cmake +++ b/cmake/opentrack-hier.cmake @@ -15,7 +15,6 @@ if(APPLE) set(opentrack-runtime-doc "/") # MUST HAVE A TRAILING BACKSLASH set(opentrack-bin "${CMAKE_INSTALL_PREFIX}") set(opentrack-doc "./doc") - set(opentrack-src "./source-code") set(opentrack-i18n "opentrack.app/Contents/Resources") # used during install set(opentrack-runtime-i18n "../Resources/i18n") # used in application set(opentrack-install-rpath "${CMAKE_INSTALL_PREFIX}/Library") @@ -25,7 +24,6 @@ elseif(WIN32) set(opentrack-runtime-doc "/doc/") # MUST HAVE A TRAILING BACKSLASH set(opentrack-bin ".") set(opentrack-doc "./doc") - set(opentrack-src "./source-code") set(opentrack-i18n "./i18n") set(opentrack-runtime-i18n "./i18n") set(opentrack-debug "./debug") @@ -36,12 +34,10 @@ else() set(opentrack-runtime-doc "/../share/doc/opentrack/") # MUST HAVE A TRAILING BACKSLASH set(opentrack-bin "bin") set(opentrack-doc "./share/doc/opentrack") - set(opentrack-src "./share/doc/opentrack/source-code") set(opentrack-install-rpath "${CMAKE_INSTALL_PREFIX}/${opentrack-libexec}") set(opentrack-i18n "./share/opentrack/i18n") set(opentrack-runtime-i18n "../share/opentrack/i18n") endif() -set(opentrack-install-src RUNTIME DESTINATION ${opentrack-libexec} LIBRARY DESTINATION ${opentrack-libexec}) function(otr_escape_string var str) string(REGEX REPLACE "([^_A-Za-z0-9./:-])" "\\\\\\1" str "${str}") diff --git a/cmake/opentrack-install.cmake b/cmake/opentrack-install.cmake index 94f3e29d..9285ee36 100644 --- a/cmake/opentrack-install.cmake +++ b/cmake/opentrack-install.cmake @@ -16,32 +16,6 @@ macro(otr_install_dir path) ) endmacro() -function(otr_setup_refresh_install_dir) - if((NOT CMAKE_INSTALL_PREFIX STREQUAL "") AND (NOT opentrack-src STREQUAL "")) - otr_escape_string(dir "${CMAKE_INSTALL_PREFIX}/${opentrack-src}/") - install(CODE "file(REMOVE_RECURSE \"${dir}\")") - endif() -endfunction() - -function(otr_install_sources) - otr_setup_refresh_install_dir() - get_property(source-dirs GLOBAL PROPERTY opentrack-all-source-dirs) - foreach(k ${source-dirs}) - file(RELATIVE_PATH dest "${CMAKE_SOURCE_DIR}" "${k}") - otr_install_dir("${opentrack-src}" "${dest}") - endforeach() - - otr_install_dir("${opentrack-src}" "${CMAKE_SOURCE_DIR}/cmake") - otr_install_dir("${opentrack-src}" "${CMAKE_SOURCE_DIR}/bin") - - otr_install_misc("${opentrack-src}" FILES "${CMAKE_SOURCE_DIR}/CMakeLists.txt") - otr_install_misc("${opentrack-doc}" FILES "${CMAKE_SOURCE_DIR}/README.md") - otr_install_misc("${opentrack-doc}" FILES "${CMAKE_SOURCE_DIR}/.github/CONTRIBUTING.md") - otr_install_misc("${opentrack-doc}" FILES "${CMAKE_SOURCE_DIR}/WARRANTY.txt") - otr_install_misc("${opentrack-doc}" FILES "${CMAKE_SOURCE_DIR}/OPENTRACK-LICENSING.txt") - otr_install_misc("${opentrack-doc}" FILES "${CMAKE_SOURCE_DIR}/AUTHORS.md") -endfunction() - function(cleanup_visual_studio_debug) otr_escape_string(pfx "${CMAKE_INSTALL_PREFIX}") install(CODE "file(REMOVE_RECURSE \"${pfx}/.vs\")") diff --git a/macosx/make-app-bundle.sh b/macosx/make-app-bundle.sh index 9265eeb9..93974243 100755 --- a/macosx/make-app-bundle.sh +++ b/macosx/make-app-bundle.sh @@ -74,7 +74,6 @@ create-dmg \ --hide-extension "$APPNAME.app" \ --no-internet-enable \ --add-folder "Document" "$install/doc" 20 40 \ - --add-folder "source-code" "$install/source-code" 220 40 \ --add-folder "Xplane-Plugin" "$install/xplane" 420 40 \ --add-folder "thirdparty" "$install/thirdparty" 620 40 \ "$version.dmg" \ |