OilfieldToolsNet/IFEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed: properly probe for cxx11 support

Browse Source
This commit is contained in:
Arne Morten Kvarving
2015-11-25 12:31:38 +01:00
committed by Knut Morten Okstad
parent 06b8996b4c
commit 41a4141be9
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmake/Modules/FindCXX11.cmake Normal file
View File

@@ -0,0 +1,18 @@
include(TestCXXAcceptsFlag)
# try to use compiler flag -std=c++11
check_cxx_accepts_flag("-std=c++11" CXX_FLAG_CXX11)
if(CXX_FLAG_CXX11)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(CXX_STD11_FLAGS "-std=c++11")
else()
# try to use compiler flag -std=c++0x for older compilers
check_cxx_accepts_flag("-std=c++0x" CXX_FLAG_CXX0X)
if(CXX_FLAG_CXX0X)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
set(CXX_STD11_FLAGS "-std=c++0x")
endif(CXX_FLAG_CXX0X)
endif(CXX_FLAG_CXX11)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(CXX11 DEFAULT_MSG CXX_STD11_FLAGS)

6
cmake/Modules/FindIFEMDeps.cmake
View File

@@ -53,6 +53,7 @@ ENDIF(IFEM_WHOLE_PROG_OPTIM)
FIND_PACKAGE(GoTools REQUIRED)
FIND_PACKAGE(GoTrivariate REQUIRED)
FIND_PACKAGE(ARPACK REQUIRED)
find_package(CXX11 REQUIRED)
# Mimimum GoTools version
IF(GoTools_VERSION_MAJOR LESS 3 OR NOT GoTools_VERSION_MAJOR)
@@ -70,9 +71,8 @@ SET(IFEM_DEPINCLUDES ${IFEM_DEPINCLUDES}
${GoTools_INCLUDE_DIRS}
${GoTrivariate_INCLUDE_DIRS})
# TODO: Fix the GoTools rule to not set CMAKE_CXX_FLAGS
SET(IFEM_CXX_FLAGS "${IFEM_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
SET(IFEM_BUILD_CXX_FLAGS "${IFEM_BUILD_CXX_FLAGS} ${CMAKE_CXX_FLAGS}")
SET(IFEM_CXX_FLAGS "${IFEM_CXX_FLAGS} ${CMAKE_CXX_FLAGS} ${CXX_STD11_FLAGS}")
SET(IFEM_BUILD_CXX_FLAGS "${IFEM_BUILD_CXX_FLAGS} ${CMAKE_CXX_FLAGS} ${CXX_STD11_FLAGS}")
# HDF5
IF(IFEM_USE_HDF5)