From 03236ba81d6c85a26695968e5e4e266a18991362 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 1 Aug 2019 14:55:49 +0200 Subject: cmake: cleanup install prefix handling --- cmake/opentrack-hier.cmake | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'cmake/opentrack-hier.cmake') diff --git a/cmake/opentrack-hier.cmake b/cmake/opentrack-hier.cmake index 7dcdb52d..d0f7c987 100644 --- a/cmake/opentrack-hier.cmake +++ b/cmake/opentrack-hier.cmake @@ -11,35 +11,35 @@ include_guard(GLOBAL) set(opentrack-install-rpath "") if(APPLE) + set(opentrack-hier-root ".") set(opentrack-hier-pfx ".") - set(opentrack-hier-path "/") # MUST HAVE A TRAILING BACKSLASH - set(opentrack-hier-doc "/") # MUST HAVE A TRAILING BACKSLASH + set(opentrack-hier-path ".") + set(opentrack-hier-doc ".") set(opentrack-hier-bin ".") - set(opentrack-doc-pfx "./doc") - set(opentrack-doc-src-pfx "./source-code") - set(opentrack-i18n-pfx "./i18n") - set(opentrack-i18n-path "./i18n") + set(opentrack-doc-pfx "doc") + set(opentrack-doc-src-pfx "source-code") + set(opentrack-i18n-pfx "i18n") elseif(WIN32) + set(opentrack-hier-root ".") set(opentrack-hier-pfx "modules") - set(opentrack-hier-path "/${opentrack-hier-pfx}/") # MUST HAVE A TRAILING BACKSLASH - set(opentrack-hier-doc "/doc/") # MUST HAVE A TRAILING BACKSLASH + set(opentrack-hier-path "${opentrack-hier-pfx}") + set(opentrack-hier-doc "doc") set(opentrack-hier-bin ".") - set(opentrack-doc-pfx "./doc") - set(opentrack-doc-src-pfx "./source-code") - set(opentrack-i18n-pfx "./i18n") - set(opentrack-i18n-path "./i18n") - set(opentrack-hier-debug "./debug") + set(opentrack-doc-pfx "doc") + set(opentrack-doc-src-pfx "source-code") + set(opentrack-i18n-pfx "i18n") + set(opentrack-hier-debug "debug") else() + set(opentrack-hier-root "..") set(opentrack-hier-pfx "libexec/opentrack") - set(opentrack-hier-path "/../${opentrack-hier-pfx}/") # MUST HAVE A TRAILING BACKSLASH - set(opentrack-hier-doc "/share/doc/opentrack/") # MUST HAVE A TRAILING BACKSLASH + set(opentrack-hier-doc "share/doc/opentrack") set(opentrack-hier-bin "bin") - set(opentrack-doc-pfx "./share/doc/opentrack") - set(opentrack-doc-src-pfx "./share/doc/opentrack/source-code") + set(opentrack-doc-pfx "share/doc/opentrack") + set(opentrack-doc-src-pfx "share/doc/opentrack/source-code") + set(opentrack-i18n-pfx "share/opentrack/i18n") set(opentrack-install-rpath "${CMAKE_INSTALL_PREFIX}/${opentrack-hier-pfx}") - set(opentrack-i18n-pfx "./share/opentrack/i18n") - set(opentrack-i18n-path "../share/opentrack/i18n") endif() +set(opentrack-hier-path "${opentrack-hier-root}/${opentrack-hier-pfx}") set(opentrack-hier-str RUNTIME DESTINATION ${opentrack-hier-pfx} LIBRARY DESTINATION ${opentrack-hier-pfx}) function(otr_escape_string var str) -- cgit v1.2.3