[SCM] OCE packaging branch, debian, updated. debian/0.11-1
QbProg
tholag at gmail.com
Thu Dec 13 19:16:25 UTC 2012
The following commit has been merged in the debian branch:
commit 40045a43b61c62317fc9705b33c97743f6df38af
Author: QbProg <tholag at gmail.com>
Date: Sat Aug 25 16:33:48 2012 +0200
OCE_RPATH_FILTER_SYSTEM_PATHS is not useful in WIN32.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9889b5c..2aff46b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -115,8 +115,11 @@ OPTION_WITH_DEFAULT( ${PROJECT_NAME}_ADD_HEADERS "Add headers to project files"
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