diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2019-06-25 19:07:55 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2019-06-25 19:07:55 +0200 |
| commit | dd99fa49655e20809baed17bc2da977b19c3b12c (patch) | |
| tree | 7aa88fb8d85e8ebbaae897770151e7fe5db871f7 | |
| parent | 45b4a12413a33e3eb1543fcef5eca238bab31446 (diff) | |
cmake: fix install prefix harder
| -rw-r--r-- | cmake/opentrack-boilerplate.cmake | 10 | ||||
| -rw-r--r-- | cmake/opentrack-hier.cmake | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/cmake/opentrack-boilerplate.cmake b/cmake/opentrack-boilerplate.cmake index d76df9e4..554b1add 100644 --- a/cmake/opentrack-boilerplate.cmake +++ b/cmake/opentrack-boilerplate.cmake @@ -216,10 +216,14 @@ function(otr_module n_) endif() if(NOT arg_NO-INSTALL) - if(arg_BIN AND WIN32) - install(TARGETS "${n}" RUNTIME DESTINATION ${opentrack-hier-bin} PERMISSIONS ${opentrack-perms-exec}) + if(arg_BIN) + install(TARGETS "${n}" + RUNTIME DESTINATION ${opentrack-hier-bin} + LIBRARY DESTINATION ${opentrack-hier-pfx} + PERMISSIONS ${opentrack-perms-exec}) else() - install(TARGETS "${n}" ${opentrack-hier-str} PERMISSIONS ${opentrack-perms-exec}) + install(TARGETS "${n}" ${opentrack-hier-str} + PERMISSIONS ${opentrack-perms-exec}) endif() if(MSVC) diff --git a/cmake/opentrack-hier.cmake b/cmake/opentrack-hier.cmake index a5e4fd77..7dcdb52d 100644 --- a/cmake/opentrack-hier.cmake +++ b/cmake/opentrack-hier.cmake @@ -20,8 +20,8 @@ if(APPLE) 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-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-bin ".") set(opentrack-doc-pfx "./doc") @@ -31,9 +31,9 @@ elseif(WIN32) 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-hier-bin "/bin") + 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-bin "bin") 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}") |