OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #295 from rolk/295_cxxreq

Browse Source 
Only fail if C++11 support is noted as REQUIRED
This commit is contained in:
Andreas Lauser 2013-08-01 06:33:05 -07:00
commit 667f056a73
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmake/Modules/FindCXX11Features.cmake
View File

@ -326,9 +326,12 @@ if (NOT HAVE_TUPLE)
endif()
if(CXX_FEATURES_MISSING)
message(FATAL_ERROR
"Your C++ compiler does not support the minimum set of C++-2011 features required. "
"Make sure to use a compiler which implements all C++-2011 features provided by GCC 4.4. "
"Your compiler does not seem to implement the following features:\n"
"${CXX_FEATURES_MISSING}")
set (CXX11FEATURES_FOUND FALSE)
if (CXX11Features_FIND_REQUIRED)
message(FATAL_ERROR
"Your C++ compiler does not support the minimum set of C++-2011 features required. "
"Make sure to use a compiler which implements all C++-2011 features provided by GCC 4.4. "
"Your compiler does not seem to implement the following features:\n"
"${CXX_FEATURES_MISSING}")
endif()
endif()

2
cmake/Modules/Finddune-common.cmake
View File

@ -16,7 +16,7 @@ find_opm_package (
"dune-common"
# dependencies
"CXX11Features;
"CXX11Features REQUIRED;
BLAS REQUIRED;
LAPACK REQUIRED;
MPI

2
cmake/Modules/Finddune-geometry.cmake
View File

@ -19,7 +19,7 @@ find_opm_package (
# TODO: we should probe for all the HAVE_* values listed below;
# however, we don't actually use them in our implementation, so
# we just include them to forward here in case anyone else does
"CXX11Features;
"CXX11Features REQUIRED;
dune-common REQUIRED
"
# header to search for

2
cmake/Modules/Finddune-grid.cmake
View File

@ -19,7 +19,7 @@ find_opm_package (
# TODO: we should probe for all the HAVE_* values listed below;
# however, we don't actually use them in our implementation, so
# we just include them to forward here in case anyone else does
"CXX11Features;
"CXX11Features REQUIRED;
dune-common REQUIRED;
dune-geometry REQUIRED
"

2
cmake/Modules/opm-core-prereqs.cmake
View File

@ -17,7 +17,7 @@ set (opm-core_DEPS
# compile with C99 support if available
"C99"
# compile with C++0x/11 support if available
"CXX11Features"
"CXX11Features REQUIRED"
# various runtime library enhancements
"Boost 1.39.0
COMPONENTS date_time filesystem system unit_test_framework signals REQUIRED"