From 12ff17463610e446fc6569ee1f4479be9107e38e Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 6 Sep 2019 08:30:28 +0200 Subject: Revert "cmake: cleanup install prefix handling" Fixes proto/freetrack Issue: #983 --- cmake/opentrack-boilerplate.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cmake/opentrack-boilerplate.cmake') diff --git a/cmake/opentrack-boilerplate.cmake b/cmake/opentrack-boilerplate.cmake index 39d75e5a..ffa4ea02 100644 --- a/cmake/opentrack-boilerplate.cmake +++ b/cmake/opentrack-boilerplate.cmake @@ -18,10 +18,10 @@ set(new-hier-path "#pragma once #endif #define OPENTRACK_LIBRARY_PREFIX \"\" -#define OPENTRACK_LIBRARY_PATH \"/${opentrack-hier-path}/\" -#define OPENTRACK_DOC_PATH \"${opentrack-hier-doc}/\" +#define OPENTRACK_LIBRARY_PATH \"${opentrack-hier-path}\" +#define OPENTRACK_DOC_PATH \"${opentrack-hier-doc}\" #define OPENTRACK_CONTRIB_PATH \"${opentrack-hier-doc}contrib/\" -#define OPENTRACK_I18N_PATH \"${opentrack-hier-root}/${opentrack-i18n-pfx}\" +#define OPENTRACK_I18N_PATH \"${opentrack-i18n-path}\" ") function(otr_write_library_paths) @@ -282,7 +282,7 @@ function(otr_install_lib target dest) set(pdb-path "") otr_pdb_for_dll(pdb-path "${path}") if(pdb-path) - install(FILES "${pdb-path}" DESTINATION "${opentrack-hier-debug}" PERMISSIONS ${opentrack-perms-file}) + install(FILES "${pdb-path}" DESTINATION "${opentrack-hier-debug}" PERMISSIONS ${opentrack-perms-exec}) endif() endif() install(FILES "${path}" DESTINATION "${dest}" PERMISSIONS ${opentrack-perms-exec}) -- cgit v1.2.3