[SCM] OCE packaging branch, debian, updated. debian/0.11-1
Johannes Obermayr
johannesobermayr at gmx.de
Thu Dec 13 19:16:31 UTC 2012
The following commit has been merged in the debian branch:
commit 839ab306fcf290ab5e11ec25f7b6f2a811ff196d
Author: Johannes Obermayr <johannesobermayr at gmx.de>
Date: Sat Nov 3 20:26:25 2012 +0100
Fix a RPATH issue if -DOCE_INSTALL_LIB_DIR is absolute.
diff --git a/adm/cmake/BuildToolkit.cmake b/adm/cmake/BuildToolkit.cmake
index 4aaf5ac..ef7dd22 100644
--- a/adm/cmake/BuildToolkit.cmake
+++ b/adm/cmake/BuildToolkit.cmake
@@ -162,7 +162,7 @@ IF(TOOLKIT_IS_PRIVATE)
SET_TARGET_PROPERTIES_INSTALL_RPATH(${TOOLKIT} "${${PROJECT_NAME}_INSTALL_PACKAGE_LIB_DIR_RPATH};${${PROJECT_NAME}_INSTALL_LIB_DIR_RPATH}")
ELSE(TOOLKIT_IS_PRIVATE)
SET(TOOLKIT_INSTALL_LIB_DIR ${${PROJECT_NAME}_INSTALL_LIB_DIR})
- SET_TARGET_PROPERTIES_INSTALL_RPATH(${TOOLKIT} "${${PROJECT_NAME}_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_LIB_DIR}")
+ SET_TARGET_PROPERTIES_INSTALL_RPATH(${TOOLKIT} "${${PROJECT_NAME}_INSTALL_LIB_DIR_RPATH}")
ENDIF(TOOLKIT_IS_PRIVATE)
INSTALL(TARGETS ${TOOLKIT}
--
OCE packaging
More information about the debian-science-commits
mailing list