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

[Denis Barbier]

The following commit has been merged in the debian branch:
commit 8b9463bed487683857ca5f483232b4407e8f1318
Merge: 2197766880b1cd7123d081ce12f9db04fd9e47ad b08182de1ab45bfb214be5f999add421764a66b2
Author: Denis Barbier <bouzim at gmail.com>
Date:   Mon Jul 2 03:20:47 2012 -0700

    Merge pull request #291 from jobermayr/master
    
    Fix wrong RPATH with absolute path in OCE_INSTALL(_\|_PACKAGE_)LIB_DIR

diff --combined CMakeLists.txt
index 1d3abf9,d623175..9889b5c
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -831,6 -831,19 +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})
@@@ -977,9 -990,14 +990,9 @@@ IF(${PROJECT_NAME}_DATAEXCHANGE
  	PROCESS_MODULE( "Data Exchange" "TKSTL;TKXSBase;TKSTEPBase;TKIGES;TKSTEPAttr;TKSTEP209;TKSTEP" "TKVRML;TKXCAF;TKXCAFSchema;TKXmlXCAF;TKBinXCAF;TKXDEIGES;TKXDESTEP" )
  ENDIF(${PROJECT_NAME}_DATAEXCHANGE)
  
 -# Draw
 -IF(${PROJECT_NAME}_DRAW)
 -	PROCESS_MODULE( "Draw" "" "TKDraw;TKTopTest;TKViewerTest;TKXSDRAW;TKDCAF;TKXDEDRAW;TKTObjDRAW" )
 -ENDIF(${PROJECT_NAME}_DRAW)
 -
  # DRAWEXE application
  IF(${PROJECT_NAME}_DRAW)
 -	PROCESS_MODULE( "Draw" "" DRAWEXE )
 +	PROCESS_MODULE( "Draw" "" "TKDraw;TKTopTest;TKViewerTest;TKXSDRAW;TKDCAF;TKXDEDRAW;TKTObjDRAW;TKQADraw;DRAWEXE" )
  ENDIF(${PROJECT_NAME}_DRAW)
  
  CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/ProjectConfig.cmake.in

-- 
OCE packaging