From cdc531afa15c16f84460764791d894d80e27aabf Mon Sep 17 00:00:00 2001
From: Joakim Hove <joakim.hove@gmail.com>
Date: Fri, 8 May 2015 16:51:03 +0200
Subject: [PATCH] Changes fetched from opm-core

---
 cmake/Modules/Finddune-istl.cmake        |  3 ++-
 cmake/Modules/ewoms-prereqs.cmake        |  2 --
 cmake/Modules/opm-material-prereqs.cmake |  2 +-
 cmake/Scripts/configure                  | 13 ++++++++++++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/cmake/Modules/Finddune-istl.cmake b/cmake/Modules/Finddune-istl.cmake
index 60f2201b0..99e34e6ce 100644
--- a/cmake/Modules/Finddune-istl.cmake
+++ b/cmake/Modules/Finddune-istl.cmake
@@ -17,7 +17,8 @@ find_opm_package (
 
   # required dependencies
   "dune-common REQUIRED;
-  SuperLU
+  SuperLU;
+  SuiteSparse COMPONENTS umfpack
   "
   # header to search for
   "dune/istl/bcrsmatrix.hh"
diff --git a/cmake/Modules/ewoms-prereqs.cmake b/cmake/Modules/ewoms-prereqs.cmake
index c8f5d6a7b..aa6917157 100644
--- a/cmake/Modules/ewoms-prereqs.cmake
+++ b/cmake/Modules/ewoms-prereqs.cmake
@@ -22,9 +22,7 @@ set (ewoms_DEPS
 	"dune-geometry REQUIRED"
 	"dune-grid REQUIRED"
 	"dune-istl REQUIRED"
-	"opm-core REQUIRED"
 	"opm-material REQUIRED"
-	"opm-parser"
 	"dune-alugrid"
 	"dune-cornerpoint"
 	# valgrind client requests
diff --git a/cmake/Modules/opm-material-prereqs.cmake b/cmake/Modules/opm-material-prereqs.cmake
index c62defe7b..60cc26529 100644
--- a/cmake/Modules/opm-material-prereqs.cmake
+++ b/cmake/Modules/opm-material-prereqs.cmake
@@ -15,7 +15,7 @@ set (opm-material_DEPS
 	# compile with C++0x/11 support if available
 	"CXX11Features REQUIRED"
 	# prerequisite OPM modules
-	"opm-core REQUIRED"
+	"opm-parser"
 	# DUNE dependency
 	"dune-common REQUIRED"
 	)
diff --git a/cmake/Scripts/configure b/cmake/Scripts/configure
index c87eecf18..5074a8d22 100755
--- a/cmake/Scripts/configure
+++ b/cmake/Scripts/configure
@@ -21,6 +21,7 @@ Optional Features:
                           [default=no]
   --disable-runpath       do not use RUNPATH in installed library [default=yes]
   --enable-lto            use whole program optimization [default=no]
+  --enable-strip-debug    separate the executable code and the debugging symbols [default=no]
   --disable-tests         do not compile and enable unit tests [default=yes]
   --disable-examples      do not compile example programs [default=yes]
   --disable-pch           do not use precompiled headers (if buggy compiler)
@@ -123,6 +124,8 @@ silent_rules=
 debug_loc=
 #use_lto=" -DWHOLE_PROG_OPTIM=OFF"
 use_lto=
+#strip_debug=" -DSTRIP_DEBUGGING_SYMBOLS=OFF"
+strip_debug=
 #use_runpath=" -DUSE_RUNPATH=OFF"
 use_runpath=
 #use_tests=" -DBUILD_TESTING=ON"
@@ -314,6 +317,10 @@ for OPT in "$@"; do
               use_lto=" -DWHOLE_PROG_OPTIM=OFF"
               pkgname=""
               ;;
+            strip-debug  )
+              strip_debug=" -DSTRIP_DEBUGGING_SYMBOLS=OFF"
+              pkgname=""
+              ;;
             openmp)
               use_openmp=" -DUSE_OPENMP=OFF"
               pkgname=""
@@ -397,6 +404,10 @@ for OPT in "$@"; do
               use_lto=" -DWHOLE_PROG_OPTIM=ON"
               shared=""
               ;;
+            strip-debug  )
+              strip_debug=" -DSTRIP_DEBUGGING_SYMBOLS=ON"
+              pkgname=""
+              ;;
             tests)
               use_tests=" -DBUILD_TESTING=ON"
               pkgname=""
@@ -534,7 +545,7 @@ elif test "$c_compiler$c_opts$cxx_compiler$cxx_opts$fort_compiler$fort_opts" !=
 fi
 
 # pass everything on to CMake
-CMDLINE="${ENVVARS}${CMAKE_COMMAND} \"${srcdir}\" ${use_ninja}\"-DCMAKE_INSTALL_PREFIX=$prefix\"${buildtype}${pch_use}${silent_rules}${debug_loc}${use_openmp}${use_mpi}${use_lto}${use_runpath}${use_tests}${use_samples}${use_underscoring}${c_compiler}${c_opts}${cxx_compiler}${cxx_opts}${fort_compiler}${fort_opts}${boost_opts}${buildname}${site} ${FEATURES}"
+CMDLINE="${ENVVARS}${CMAKE_COMMAND} \"${srcdir}\" ${use_ninja}\"-DCMAKE_INSTALL_PREFIX=$prefix\"${buildtype}${pch_use}${silent_rules}${debug_loc}${use_openmp}${use_mpi}${use_lto}${strip_debug}${use_runpath}${use_tests}${use_samples}${use_underscoring}${c_compiler}${c_opts}${cxx_compiler}${cxx_opts}${fort_compiler}${fort_opts}${boost_opts}${buildname}${site} ${FEATURES}"
 echo --- calling CMake ---
 echo "${CMDLINE}"
 eval exec "${CMDLINE}"