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

Denis Barbier bouzim at gmail.com
Thu Dec 13 19:16:27 UTC 2012


The following commit has been merged in the debian branch:
commit 9d2a224ce1e9c9adb371114e60cdeab3dc8e8512
Merge: 2374b771d43b6baf0ebcb15ca69a445507353c87 40045a43b61c62317fc9705b33c97743f6df38af
Author: Denis Barbier <bouzim at gmail.com>
Date:   Tue Sep 4 12:26:21 2012 -0700

    Merge pull request #296 from tpaviot/review/no-win32-rpath
    
    OCE_RPATH_FILTER_SYSTEM_PATHS is not useful in WIN32.

diff --combined CMakeLists.txt
index edd82a1,2aff46b..d85937d
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -30,7 -30,7 +30,7 @@@ SET(OCE_VERSION_DEVEL -dev
  # bugfix release: add ${OCE_VERSION_PATCH} to OCE_VERSION
  SET(OCE_VERSION ${OCE_VERSION_MAJOR}.${OCE_VERSION_MINOR}${OCE_VERSION_DEVEL})
  
 -SET(OCE_ABI_SOVERSION 3)
 +SET(OCE_ABI_SOVERSION 4)
  SET(OCE_ABI_VERSION ${OCE_ABI_SOVERSION}.0.0)
  
  # Set the minimum version of cmake required to 2.6
@@@ -115,8 -115,11 +115,11 @@@ OPTION_WITH_DEFAULT( ${PROJECT_NAME}_AD
  MARK_AS_ADVANCED(${PROJECT_NAME}_ADD_HEADERS)
  OPTION_WITH_DEFAULT( ${PROJECT_NAME}_DISABLE_BSPLINE_MESHER "Disable BSpline Mesher" OFF )
  MARK_AS_ADVANCED(${PROJECT_NAME}_DISABLE_BSPLINE_MESHER)
- OPTION_WITH_DEFAULT( ${PROJECT_NAME}_RPATH_FILTER_SYSTEM_PATHS "Filter out system paths from RPATH" ON )
- MARK_AS_ADVANCED(${PROJECT_NAME}_RPATH_FILTER_SYSTEM_PATHS)
+ 
+ IF (NOT WIN32)
+   OPTION_WITH_DEFAULT( ${PROJECT_NAME}_RPATH_FILTER_SYSTEM_PATHS "Filter out system paths from RPATH" ON )
+   MARK_AS_ADVANCED(${PROJECT_NAME}_RPATH_FILTER_SYSTEM_PATHS)
+ ENDIF (NOT WIN32)
  
  # The default for the DEB define is ON for all the platforms , in debug mode.
  # In MSVC it is not desirable to have it ON by default, since users must 

-- 
OCE packaging



More information about the debian-science-commits mailing list