[yade] 01/02: Do not enable LINSOLV if CGAL not found. (Closes: #880792)

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository yade.

commit 92d9c5e06c96338644b233728e4e9d37d0f143ab
Author: Anton Gladky <gladk at debian.org>
Date:   Sun Nov 5 11:09:39 2017 +0100

    Do not enable LINSOLV if CGAL not found. (Closes: #880792)
---
 ...le-LINSOLV-if-CGAL-not-found.-Closes-8807.patch | 39 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 40 insertions(+)

diff --git a/debian/patches/0001-Do-not-enable-LINSOLV-if-CGAL-not-found.-Closes-8807.patch b/debian/patches/0001-Do-not-enable-LINSOLV-if-CGAL-not-found.-Closes-8807.patch
new file mode 100644
index 0000000..632731e
--- /dev/null
+++ b/debian/patches/0001-Do-not-enable-LINSOLV-if-CGAL-not-found.-Closes-8807.patch
@@ -0,0 +1,39 @@
+From 08b050532fa88fce29daeb5e5c601e1762d005df Mon Sep 17 00:00:00 2001
+From: Anton Gladky <gladk at debian.org>
+Date: Sun, 5 Nov 2017 11:08:39 +0100
+Subject: [PATCH] Do not enable LINSOLV if CGAL not found. (Closes: #880792)
+
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 26f3d0f..132ef55 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -315,7 +315,7 @@ IF(ENABLE_LINSOLV)
+   FIND_PACKAGE(Cholmod)
+   FIND_PACKAGE(OpenBlas)
+   FIND_PACKAGE(Metis)
+-  IF(CHOLMOD_FOUND AND OPENBLAS_FOUND AND METIS_FOUND)
++  IF(CHOLMOD_FOUND AND OPENBLAS_FOUND AND METIS_FOUND AND CGAL_FOUND)
+     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CGAL_DEFINITIONS} -DLINSOLV -DFLOW_ENGINE")
+     SET(LINKLIBS  "${LINKLIBS};${CHOLMOD_LIBRARIES};${AMD_LIBRARY};${CAMD_LIBRARY};${COLAMD_LIBRARY};${CCOLAMD_LIBRARY};${OPENBLAS_LIBRARY};${METIS_LIBRARY}")
+     INCLUDE_DIRECTORIES(${METIS_INCLUDE_DIR} ${CHOLMOD_INCLUDE_DIR})
+@@ -323,11 +323,11 @@ IF(ENABLE_LINSOLV)
+     MESSAGE(STATUS "Found OpenBlas")
+     MESSAGE(STATUS "Found Metis")
+     SET(CONFIGURED_FEATS "${CONFIGURED_FEATS} LINSOLV")
+-  ELSE(CHOLMOD_FOUND AND OPENBLAS_FOUND AND METIS_FOUND)
++  ELSE(CHOLMOD_FOUND AND OPENBLAS_FOUND AND METIS_FOUND AND CGAL_FOUND)
+     MESSAGE(STATUS "Missing dependency for LINSOLV, disabled")
+     SET(DISABLED_FEATS "${DISABLED_FEATS} LINSOLV")
+     SET(ENABLE_LINSOLV OFF)
+-  ENDIF(CHOLMOD_FOUND AND OPENBLAS_FOUND AND METIS_FOUND)
++  ENDIF(CHOLMOD_FOUND AND OPENBLAS_FOUND AND METIS_FOUND AND CGAL_FOUND)
+ ELSE(ENABLE_LINSOLV)
+   SET(DISABLED_FEATS "${DISABLED_FEATS} LINSOLV")
+ ENDIF(ENABLE_LINSOLV)
+-- 
+2.14.2
+
diff --git a/debian/patches/series b/debian/patches/series
index ac0e05d..26f813f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 01_remove_google_analytics.patch
 08_fix_gui.patch
 09_fix_periodic_boundaries.patch
+0001-Do-not-enable-LINSOLV-if-CGAL-not-found.-Closes-8807.patch
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/yade.git