From d8cd9ca95a618950870513e6c2b647800154d703 Mon Sep 17 00:00:00 2001
From: Amaury Johnan <amjohnen@gmail.com>
Date: Sat, 12 Apr 2014 09:13:21 +0000
Subject: [PATCH] revert commit 18213. SCIP no more useful
---
CMakeLists.txt | 13 -------------
Common/GmshConfig.h.in | 1 -
Numeric/MetricBasis.cpp | 1 -
3 files changed, 15 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98fcf093b1..fb2abf7c69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -78,7 +78,6 @@ opt(POPPLER "Enable Poppler for displaying PDF documents (experimental)" OFF)
opt(QT "Enable dummy QT graphical interface proof-of-concept (experimental)" OFF)
opt(RTREE "Enable RTREE (used for quad/hex mesh generation)" ${DEFAULT})
opt(SALOME "Enable Salome routines for CAD healing" ${DEFAULT})
-opt(SCIP "Enable SCIP optimization suite" OFF)
opt(SGEOM "Enable SGEOM interface to OCC (experimental)" OFF)
opt(SLEPC "Enable SLEPc eigensolvers (required for conformal compounds)" ${DEFAULT})
opt(SOLVER "Enable built-in finite element solvers (required for compounds)" ${DEFAULT})
@@ -1067,18 +1066,6 @@ if(ENABLE_ACIS)
endif(ACIS_LIB)
endif(ENABLE_ACIS)
-if(ENABLE_SCIP)
- find_library(SCIP_LIB scipopt PATH_SUFFIXES lib)
- if(SCIP_LIB)
- find_path(SCIP_INC "scip-3.1.0/src/scip/scip.h")
- if(SCIP_INC)
- set_config_option(HAVE_SCIP "SCIP")
- list(APPEND EXTERNAL_LIBRARIES ${SCIP_LIB})
- list(APPEND EXTERNAL_INCLUDES "${SCIP_INC}/scip-3.1.0/src;${SCIP_INC}/soplex-2.0.0/src")
- endif(SCIP_INC)
- endif(SCIP_LIB)
-endif(ENABLE_SCIP)
-
if(HAVE_ZLIB AND ENABLE_COMPRESSED_IO)
set_config_option(HAVE_COMPRESSED_IO "CompressedIO")
endif(HAVE_ZLIB AND ENABLE_COMPRESSED_IO)
diff --git a/Common/GmshConfig.h.in b/Common/GmshConfig.h.in
index 0883c392be..7c4949eaab 100644
--- a/Common/GmshConfig.h.in
+++ b/Common/GmshConfig.h.in
@@ -59,7 +59,6 @@
#cmakedefine HAVE_QT
#cmakedefine HAVE_RTREE
#cmakedefine HAVE_SALOME
-#cmakedefine HAVE_SCIP
#cmakedefine HAVE_SGEOM
#cmakedefine HAVE_SLEPC
#cmakedefine HAVE_SOLVER
diff --git a/Numeric/MetricBasis.cpp b/Numeric/MetricBasis.cpp
index be0bb78574..657fb42ef1 100644
--- a/Numeric/MetricBasis.cpp
+++ b/Numeric/MetricBasis.cpp
@@ -3,7 +3,6 @@
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to the public mailing list <gmsh@geuz.org>.
-#include "GmshConfig.h"
#include "MetricBasis.h"
#include "BasisFactory.h"
#include "pointsGenerators.h"
--
GitLab