1 files changed, 54 insertions, 61 deletions
diff --git a/cmake/opentrack-hier.cmake b/cmake/opentrack-hier.cmake
index 7a0659c6..bb1a435d 100644
--- a/cmake/opentrack-hier.cmake
+++ b/cmake/opentrack-hier.cmake
@@ -1,61 +1,54 @@
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
-# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
-# AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
-# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
-# PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-set(opentrack-install-rpath "")
-if(APPLE)
-    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-str RUNTIME DESTINATION . LIBRARY DESTINATION .)
-    set(opentrack-doc-pfx "./doc")
-    set(opentrack-doc-src-pfx "./source-code")
-    set(opentrack-i18n-pfx "./i18n")
-    set(opentrack-i18n-path "./i18n")
-elseif(WIN32)
-    set(opentrack-hier-pfx "./modules")
-    set(opentrack-hier-path "/modules/")                # MUST HAVE A TRAILING BACKSLASH
-    set(opentrack-hier-doc "/doc/")                     # MUST HAVE A TRAILING BACKSLASH
-    set(opentrack-doc-pfx "./doc")
-    set(opentrack-doc-src-pfx "./source-code")
-    set(opentrack-hier-str RUNTIME DESTINATION ./modules/ LIBRARY DESTINATION ./modules/)
-    set(opentrack-i18n-pfx "./i18n")
-    set(opentrack-i18n-path "./i18n")
-    set(opentrack-hier-debug "./debug")
-else()
-    set(opentrack-hier-pfx "libexec/opentrack")
-    set(opentrack-hier-path "/../libexec/opentrack/")   # MUST HAVE A TRAILING BACKSLASH
-    set(opentrack-hier-doc "/share/doc/opentrack/")     # MUST HAVE A TRAILING BACKSLASH
-    set(opentrack-doc-pfx "./share/doc/opentrack")
-    set(opentrack-doc-src-pfx "./share/doc/opentrack/source-code")
-    set(opentrack-install-rpath "${CMAKE_INSTALL_PREFIX}/${opentrack-hier-pfx}")
-    set(opentrack-hier-str ARCHIVE DESTINATION lib/opentrack LIBRARY DESTINATION ${opentrack-hier-pfx} RUNTIME DESTINATION bin)
-    set(opentrack-i18n-pfx "./libexec/opentrack/i18n")
-    set(opentrack-i18n-path "../libexec/opentrack/i18n")
-endif()
-
-function(otr_escape_string var str)
-    string(REGEX REPLACE "([\$\\\"#])" "\\\\\\1" tmp__ "${str}")
-        set(${var} "${tmp__}" PARENT_SCOPE)
-endfunction()
-
-function(otr_setup_refresh_install_dir)
-    if((NOT CMAKE_INSTALL_PREFIX STREQUAL "") AND (NOT opentrack-doc-src-pfx STREQUAL ""))
-        otr_escape_string(dir "${CMAKE_INSTALL_PREFIX}/${opentrack-doc-src-pfx}/")
-        install(CODE "file(REMOVE_RECURSE \"${dir}\")")
-    endif()
-endfunction()
-
-set(opentrack-contrib-pfx "${opentrack-doc-pfx}/contrib")
-
-set(opentrack-binary-suffix "")
-if(APPLE)
-    set(opentrack-binary-suffix ".bin")
-elseif(WIN32)
-    set(opentrack-binary-suffix ".exe")
-endif()
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
+# WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+# AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+# DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+# PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+include_guard(GLOBAL)
+
+if(APPLE)
+    set(opentrack-libexec "Plugins")
+    set(opentrack-runtime-libexec "/Plugins/")                        # MUST HAVE A TRAILING BACKSLASH, Used in APP
+    set(opentrack-runtime-doc "/")                         # MUST HAVE A TRAILING BACKSLASH
+    set(opentrack-bin "${CMAKE_INSTALL_PREFIX}")
+    set(opentrack-doc "doc")
+    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")
+elseif(WIN32)
+    set(opentrack-libexec "modules")
+    set(opentrack-runtime-libexec "/${opentrack-libexec}/")  # MUST HAVE A TRAILING BACKSLASH
+    set(opentrack-runtime-doc "/doc/")                     # MUST HAVE A TRAILING BACKSLASH
+    set(opentrack-bin ".")
+    set(opentrack-doc "doc")
+    set(opentrack-i18n "i18n")
+    set(opentrack-runtime-i18n "./i18n")
+    set(opentrack-debug "./debug")
+    set(opentrack-install-rpath "")
+else()
+    set(opentrack-libexec "libexec/opentrack")
+    set(opentrack-runtime-libexec "/../${opentrack-libexec}/")   # MUST HAVE A TRAILING BACKSLASH
+    set(opentrack-runtime-doc "/../share/doc/opentrack/")         # MUST HAVE A TRAILING BACKSLASH
+    set(opentrack-bin "bin")
+    set(opentrack-doc "share/doc/opentrack")
+    set(opentrack-install-rpath "${CMAKE_INSTALL_PREFIX}/${opentrack-libexec}")
+    set(opentrack-i18n "share/opentrack/i18n")
+    set(opentrack-runtime-i18n "../share/opentrack/i18n")
+endif()
+
+function(otr_escape_string var str)
+    string(REGEX REPLACE "([^_A-Za-z0-9./:-])" "\\\\\\1" str "${str}")
+    set(${var} "${str}" PARENT_SCOPE)
+endfunction()
+
+set(opentrack-contrib-pfx "${opentrack-doc}/contrib")
+
+set(opentrack-binary-suffix "")
+if(WIN32)
+    set(opentrack-binary-suffix ".exe")
+endif()
+
+set(CMAKE_INSTALL_RPATH "${opentrack-install-rpath}")