diff options
| author | Gard Spreemann <gspr@nonempty.org> | 2019-12-10 14:27:03 +0100 |
|---|---|---|
| committer | Gard Spreemann <gspr@nonempty.org> | 2019-12-10 14:27:03 +0100 |
| commit | 1e87e95397d1d7da76818509bd1d07509b4c46d7 (patch) | |
| tree | 3b778f4704476fee22569c63665104fcc122c26e | |
| parent | ae82b7cf9bb120c8b68acbcf59eaff4d8734c87a (diff) | |
Drop 0004-Force-linking-of-Python-module-with-CGAL.patch since CGAL is now header-only.
| -rw-r--r-- | debian/patches/0004-Force-linking-of-Python-module-with-CGAL.patch | 21 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 22 deletions
diff --git a/debian/patches/0004-Force-linking-of-Python-module-with-CGAL.patch b/debian/patches/0004-Force-linking-of-Python-module-with-CGAL.patch deleted file mode 100644 index 75c516cb..00000000 --- a/debian/patches/0004-Force-linking-of-Python-module-with-CGAL.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: Gard Spreemann <gspr@nonempty.org> -Date: Wed, 25 Sep 2019 15:16:27 +0200 -Subject: Force linking of Python module with CGAL. - ---- - src/python/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt -index 1778290..4c6840f 100644 ---- a/src/python/CMakeLists.txt -+++ b/src/python/CMakeLists.txt -@@ -129,7 +129,7 @@ if(PYTHONINTERP_FOUND) - set(GUDHI_PYTHON_EXTRA_COMPILE_ARGS "${GUDHI_PYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_HEADER_ONLY', ") - else(CGAL_HEADER_ONLY) - add_gudhi_debug_info("CGAL version ${CGAL_VERSION}") -- add_GUDHI_PYTHON_lib("${CGAL_LIBRARY}") -+ add_GUDHI_PYTHON_lib("${CGAL_LIBRARIES_DIR}/libCGAL.so") - set(GUDHI_PYTHON_LIBRARY_DIRS "${GUDHI_PYTHON_LIBRARY_DIRS}'${CGAL_LIBRARIES_DIR}', ") - message("** Add CGAL ${CGAL_LIBRARIES_DIR}") - # If CGAL is not header only, CGAL library may link with boost system, diff --git a/debian/patches/series b/debian/patches/series index aa30d9dc..06bb48b7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,5 @@ 0001-Disable-tests-that-use-DFSG-deleted-data-files.patch 0002-Use-system-MathJax.patch -0004-Force-linking-of-Python-module-with-CGAL.patch 0005-Force-linking-against-libatomic-for-parts-that-use-T.patch 0006-Offline-header-for-docs.patch 0007-Disable-Sphinx.patch |