[SCM] OCE packaging branch, debian, updated. debian/0.11-1

[Johannes Obermayr]

The following commit has been merged in the debian branch:
commit b08182de1ab45bfb214be5f999add421764a66b2
Author: Johannes Obermayr <johannesobermayr at gmx.de>
Date:   Wed Jun 13 19:05:49 2012 +0200

    Fix wrong RPATH with absolute path in OCE_INSTALL(_\|_PACKAGE_)LIB_DIR
    
    Fixes: https://github.com/tpaviot/oce/issues/290

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e1d1c2..d623175 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -831,6 +831,19 @@ ELSE(MSVC)
 	ENDIF(NOT DEFINED ${PROJECT_NAME}_INSTALL_PACKAGE_LIB_DIR)
 ENDIF(MSVC)
 
+# RPATHS
+IF(IS_ABSOLUTE ${${PROJECT_NAME}_INSTALL_LIB_DIR})
+	SET(${PROJECT_NAME}_INSTALL_LIB_DIR_RPATH ${${PROJECT_NAME}_INSTALL_LIB_DIR})
+ELSE(IS_ABSOLUTE ${${PROJECT_NAME}_INSTALL_LIB_DIR})
+	SET(${PROJECT_NAME}_INSTALL_LIB_DIR_RPATH ${${PROJECT_NAME}_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_LIB_DIR})
+ENDIF(IS_ABSOLUTE ${${PROJECT_NAME}_INSTALL_LIB_DIR})
+
+IF(IS_ABSOLUTE ${${PROJECT_NAME}_INSTALL_PACKAGE_LIB_DIR})
+	SET(${PROJECT_NAME}_INSTALL_PACKAGE_LIB_DIR_RPATH ${${PROJECT_NAME}_INSTALL_PACKAGE_LIB_DIR})
+ELSE(IS_ABSOLUTE ${${PROJECT_NAME}_INSTALL_PACKAGE_LIB_DIR})
+	SET(${PROJECT_NAME}_INSTALL_PACKAGE_LIB_DIR_RPATH ${${PROJECT_NAME}_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_PACKAGE_LIB_DIR})
+ENDIF(IS_ABSOLUTE ${${PROJECT_NAME}_INSTALL_PACKAGE_LIB_DIR})
+
 # Includes
 IF(NOT DEFINED ${PROJECT_NAME}_INSTALL_INCLUDE_DIR)
 	SET(${PROJECT_NAME}_INSTALL_INCLUDE_DIR include/${PROJECT_NAME_LOWERCASE})
diff --git a/adm/cmake/BuildToolkit.cmake b/adm/cmake/BuildToolkit.cmake
index d214fe9..ec8e7fa 100644
--- a/adm/cmake/BuildToolkit.cmake
+++ b/adm/cmake/BuildToolkit.cmake
@@ -159,7 +159,7 @@ ENDMACRO(SET_TARGET_PROPERTIES_INSTALL_RPATH target dir)
 
 IF(TOOLKIT_IS_PRIVATE)
 	SET(TOOLKIT_INSTALL_LIB_DIR ${${PROJECT_NAME}_INSTALL_PACKAGE_LIB_DIR})
-	SET_TARGET_PROPERTIES_INSTALL_RPATH(${TOOLKIT} "${${PROJECT_NAME}_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_PACKAGE_LIB_DIR};${${PROJECT_NAME}_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_LIB_DIR}")
+	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}")
diff --git a/adm/cmake/DRAWEXE/CMakeLists.txt b/adm/cmake/DRAWEXE/CMakeLists.txt
index ccbd637..16ace3f 100644
--- a/adm/cmake/DRAWEXE/CMakeLists.txt
+++ b/adm/cmake/DRAWEXE/CMakeLists.txt
@@ -51,7 +51,7 @@ ENDIF(NOT ${PROJECT_NAME}_NO_LIBRARY_VERSION)
 
 ADD_EXECUTABLE(${TOOLKIT_APP} ${TOOLKIT_APP_SOURCE_FILES} ${TOOLKIT_RESOURCES} )
 
-SET_TARGET_PROPERTIES_INSTALL_RPATH(${TOOLKIT_APP} "${${PROJECT_NAME}_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_LIB_DIR};${${PROJECT_NAME}_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_PACKAGE_LIB_DIR}")
+SET_TARGET_PROPERTIES_INSTALL_RPATH(${TOOLKIT_APP} "${${PROJECT_NAME}_INSTALL_LIB_DIR_RPATH};${${PROJECT_NAME}_INSTALL_PACKAGE_LIB_DIR_RPATH}")
 
 IF(WIN32 AND (CMAKE_CONFIGURATION_TYPES OR NMAKE))
 	SET_TARGET_PROPERTIES(${TOOLKIT_APP} PROPERTIES

-- 
OCE packaging