Commit 03fedf35 authored by David Moxey's avatar David Moxey

Undo previous commit and simplify a bit. Bump required CMake to 2.8.11

parent 91769aa3
......@@ -39,6 +39,8 @@ v5.0.0
- Fix minor bug in ARPACK thirdparty build cmake (!874)
- Added in sum factorisation version for pyramid expnasions and orthogonal
expansion in pyramids (!750)
- Adjust boost third-party compilation to account for different toolset
choices (!886)
- Switch MeshGraph to use factory pattern and add HDF5 geometry support (!900,
!904, !941)
- Restructure the low energy preconditioner to handle pyramidic and variable
......
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build,
options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release
RelWithDebInfo MinSizeRel.")
......
......@@ -9,20 +9,6 @@
#If the user has not set BOOST_ROOT, look in a couple common places first.
MESSAGE(STATUS "Searching for Boost:")
# Macro to parse major and minor version from version string, since boost
# requires e.g. gcc-4.8 as a toolset.
MACRO(MAJOR_MINOR_VERSION VAR VERSIONSTR)
STRING(REPLACE "." ";" VERLIST ${VERSIONSTR})
LIST(GET VERLIST 0 ${VAR}_MAJOR)
LIST(GET VERLIST 1 ${VAR}_MINOR)
LIST(GET VERLIST 2 ${VAR}_PATCH)
SET(${VAR} ${${VAR}_MAJOR}.${${VAR}_MINOR})
UNSET(VERLIST)
UNSET(${VAR}_MAJOR)
UNSET(${VAR}_MINOR)
UNSET(${VAR}_PATCH)
ENDMACRO()
# Minimum version and boost libraries required
SET(MIN_VER "1.56.0")
SET(NEEDED_BOOST_LIBS thread iostreams filesystem system program_options regex)
......@@ -118,14 +104,13 @@ IF (THIRDPARTY_BUILD_BOOST)
SET(TOOLSET intel)
ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
SET(TOOLSET gcc)
MAJOR_MINOR_VERSION(TOOLSET_VERSION ${CMAKE_CXX_COMPILER_VERSION})
SET(TOOLSET_VERSION ${CMAKE_CXX_COMPILER_VERSION})
ELSEIF(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
SET(TOOLSET clang)
MAJOR_MINOR_VERSION(TOOLSET_VERSION ${CMAKE_CXX_COMPILER_VERSION})
SET(TOOLSET_VERSION ${CMAKE_CXX_COMPILER_VERSION})
ELSE()
MESSAGE(STATUS "Unknown compiler for boost build, assuming gcc toolset")
SET(TOOLSET gcc)
SET(TOOLSET_VERSION ${CMAKE_CXX_COMPILER_VERSION})
ENDIF()
IF (TOOLSET_VERSION STREQUAL "")
......@@ -200,7 +185,7 @@ IF (THIRDPARTY_BUILD_BOOST)
ENDIF (APPLE)
# Write to jamfile to use appropriate toolset.
SET(cmd_string "using ${TOOLSET} : ${TOOLSET_VERSION} : ${CMAKE_CXX_COMPILER} \\\;")
SET(cmd_string "using ${TOOLSET} : ${TOOLSET_VERSION} : ${CMAKE_CXX_COMPILER} $<SEMICOLON>")
IF (UNIX)
EXTERNALPROJECT_ADD_STEP(boost conf-project-conf
COMMAND cmake -E echo "${cmd_string}" > ${TPBUILD}/boost/tools/build/src/user-config.jam
......
......@@ -55,7 +55,7 @@ installed system-wide).
Package & Req. & Sys. & User & Auto. & Note \\
\midrule
C++ compiler & \cmark & \cmark & & & gcc, icc, etc \\
CMake $>2.8.7$ & \cmark & \cmark & \cmark & & Ncurses
CMake $>2.8.11$ & \cmark & \cmark & \cmark & & Ncurses
GUI optional
\\
BLAS & \cmark & \cmark & \cmark & & Or MKL,
......@@ -215,7 +215,7 @@ system-wide).
Package & Req. & MacPorts & User & Auto. & Note \\
\midrule
Xcode & \cmark & & & & Provides developer tools \\
CMake $>2.8.7$ & \cmark & \texttt{cmake} & \cmark & & Ncurses
CMake $>2.8.11$ & \cmark & \texttt{cmake} & \cmark & & Ncurses
GUI optional \\
BLAS & \cmark & & & & Part of
Xcode \\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment