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

[Johannes Obermayr]

The following commit has been merged in the debian branch:
commit ed0c42eb975d64ee3cd38e6ad07c625a3fb0faf1
Author: Johannes Obermayr <johannesobermayr at gmx.de>
Date:   Sat Nov 3 20:18:11 2012 +0100

    Fix generation of ${PROJECT_NAME}_CMAKE_DATA_TO_INCLUDE_RELATIVE_DIR.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d85937d..66274b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -885,9 +885,22 @@ IF(NOT DEFINED ${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR)
 		ENDIF(APPLE)
 	ENDIF(WIN32)
 ENDIF(NOT DEFINED ${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR)
+
 # This relative path is written into OCEConfig.cmake to set OCE_INCLUDE_DIRS relative to OCEConfig.cmake
 # There is no need to prepend ${PROJECT_NAME}_INSTALL_PREFIX, CMake convention is to use slashes.
-FILE(RELATIVE_PATH ${PROJECT_NAME}_CMAKE_DATA_TO_INCLUDE_RELATIVE_DIR "/${${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR}" "/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
+# The first part is required if -DOCE_INSTALL_CMAKE_DATA_DIR and -DOCE_INSTALL_INCLUDE_DIR are not both absolute paths.
+IF(IS_ABSOLUTE ${${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR})
+	SET(_${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR ${${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR})
+ELSE(IS_ABSOLUTE ${${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR})
+	SET(_${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR})
+ENDIF(IS_ABSOLUTE ${${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR})
+IF(IS_ABSOLUTE ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+	SET(_${PROJECT_NAME}_INSTALL_INCLUDE_DIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+ELSE(IS_ABSOLUTE ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+	SET(_${PROJECT_NAME}_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+ENDIF(IS_ABSOLUTE ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+# Now the relative path can be generated
+FILE(RELATIVE_PATH ${PROJECT_NAME}_CMAKE_DATA_TO_INCLUDE_RELATIVE_DIR "${_${PROJECT_NAME}_INSTALL_CMAKE_DATA_DIR}" "${_${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
 
 FOREACH(RESOURCE_FILE ${INSTALL_RESOURCE_FILES})
 	GET_FILENAME_COMPONENT(RESOURCE_PATH ${RESOURCE_FILE} PATH)

-- 
OCE packaging