Skip to content

Removed gnu++0x block since we are now requiring c++ 14. #394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbriseid merged 1 commit into from
Oct 21, 2025
Merged

Removed gnu++0x block since we are now requiring c++ 14. #394

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 0 additions & 46 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
PROJECT(GoTools)


CMAKE_MINIMUM_REQUIRED(VERSION 3.5)

# Set version info
Expand Down Expand Up @@ -72,47 +71,6 @@ SET(Boost_ADDITIONAL_VERSIONS
)
FIND_PACKAGE(Boost)

# Check if compiler supports c++-0x
INCLUDE(CheckCXXCompilerFlag)
IF(CMAKE_CXX_COMPILER_ID MATCHES GNU OR
CMAKE_CXX_COMPILER_ID MATCHES Clang)
CHECK_CXX_COMPILER_FLAG("-std=gnu++0x" HAVE_0x)
IF(HAVE_0x)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")
ELSE(HAVE_0x)
# C++0x is not supported - check for Boost?
IF(Boost_FOUND)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_BOOST=1")
SET(GoTools_COMMON_INCLUDE_DIRS
${GoTools_COMMON_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
ELSE(Boost_FOUND)
MESSAGE(FATAL_ERROR "Either Boost or a compiler with c++0x support is needed")
ENDIF(Boost_FOUND)
ENDIF(HAVE_0x)
ENDIF() #CMAKE_CXX_COMPILER_ID MATCHES GNU or Clang)
IF(CMAKE_CXX_COMPILER_ID MATCHES Intel)
# icpc's c++0x is lacking
IF(Boost_FOUND)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_BOOST=1")
SET(GoTools_COMMON_INCLUDE_DIRS
${GoTools_COMMON_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
ELSE(Boost_FOUND)
MESSAGE(FATAL_ERROR "Either Boost or a compiler with c++0x support is needed")
ENDIF(Boost_FOUND)
ENDIF(CMAKE_CXX_COMPILER_ID MATCHES Intel)
IF(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
IF(MSVC90) # Visual Studio 2008 support (c++0x is missing)
IF(Boost_FOUND)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_BOOST=1")
SET(GoTools_COMMON_INCLUDE_DIRS
${GoTools_COMMON_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
ELSE(Boost_FOUND)
MESSAGE(FATAL_ERROR "Either Boost or a compiler with c++0x support is needed")
ENDIF(Boost_FOUND)
ENDIF(MSVC90)
ENDIF(CMAKE_CXX_COMPILER_ID MATCHES MSVC)


# Set install prefix on Windows
IF(WIN32)
SET(CMAKE_INSTALL_PREFIX CACHE INTERNAL "")
Expand All @@ -122,16 +80,13 @@ ENDIF(WIN32)
# Organize the project in folders (VS only?)
SET_PROPERTY(GLOBAL PROPERTY USE_FOLDERS ON)


# For newmat/sisl/ttl to know they are compiled as modules
SET(GoTools_ALL_COMPILE 1)


# Compile apps and examples
OPTION(GoTools_COMPILE_APPS
"Compile applications?" ON)


# Compile unit test - depends on Boost
IF(Boost_FOUND)
OPTION(GoTools_COMPILE_TESTS
Expand All @@ -146,7 +101,6 @@ IF(Boost_FOUND)
ENDIF(GoTools_COMPILE_TESTS)
ENDIF(Boost_FOUND)


# Comment out the modules you don't want to build

ADD_SUBDIRECTORY(newmat)
Expand Down