[mshr] 01/01: add patches/build_cgal_component_library
Drew Parsons
dparsons at moszumanska.debian.org
Wed May 18 04:39:58 UTC 2016
This is an automated email from the git hooks/post-receive script.
dparsons pushed a commit to branch master
in repository mshr.
commit 31d8fe074f63d9e142ceb890a2da5d0226d721fb
Author: Drew Parsons <dparsons at debian.org>
Date: Wed May 18 11:37:30 2016 +0800
add patches/build_cgal_component_library
The CGAL build was trying to remove //CMakeLists.txt rather than
/CMakeLists.txt to identify the CGAL component libraries, resulting in
misidentification of the components and breaking the build.
---
debian/patches/build_cgal_component_library | 13 +++++++++++++
debian/patches/series | 1 +
2 files changed, 14 insertions(+)
diff --git a/debian/patches/build_cgal_component_library b/debian/patches/build_cgal_component_library
new file mode 100644
index 0000000..4b4116a
--- /dev/null
+++ b/debian/patches/build_cgal_component_library
@@ -0,0 +1,13 @@
+Index: mshr/3rdparty/CGAL-4.6/src/CMakeLists.txt
+===================================================================
+--- mshr.orig/3rdparty/CGAL-4.6/src/CMakeLists.txt
++++ mshr/3rdparty/CGAL-4.6/src/CMakeLists.txt
+@@ -118,7 +118,7 @@ foreach(package ${CGAL_CONFIGURED_PACKAG
+ file(GLOB CONFIGURED_LIBS_IN_PACKAGE ${package}/src/CGAL_*/CMakeLists.txt)
+ foreach (libconfigfile ${CONFIGURED_LIBS_IN_PACKAGE})
+ string(REPLACE "${package}/src/" "" libconfigfile ${libconfigfile})
+- string(REPLACE "//CMakeLists.txt" "" CGAL_CONFIGURED_LIBRARY_NAME ${libconfigfile})
++ string(REPLACE "/CMakeLists.txt" "" CGAL_CONFIGURED_LIBRARY_NAME ${libconfigfile})
+ if (NOT ${CGAL_CONFIGURED_LIBRARY_NAME} STREQUAL "CGAL")
+
+ message(STATUS "Sources for CGAL component library '${CGAL_CONFIGURED_LIBRARY_NAME}' detected")
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9513b6b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+build_cgal_component_library
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fenics/mshr.git
More information about the debian-science-commits
mailing list