Commit ab0d02fd authored by Lynn Garren's avatar Lynn Garren
Browse files

Merge branch 'release/CLHEP_2_3_2_2'

parents f442920e 8bda6f0c
...@@ -32,7 +32,7 @@ cmake_minimum_required(VERSION 3.2) ...@@ -32,7 +32,7 @@ cmake_minimum_required(VERSION 3.2)
# project name # project name
project(CLHEP) project(CLHEP)
set( VERSION 2.3.2.1 ) set( VERSION 2.3.2.2 )
# If Policy CMP0042 exists, use OLD to prefer the use of install names # If Policy CMP0042 exists, use OLD to prefer the use of install names
# instead of the new @rpath default. # instead of the new @rpath default.
......
==============================
22.04.16 Release CLHEP-2.3.2.2
==============================
2016-04-21 Lynn Garren <garren@fnal.gov>
* cmake: need to recognize both Clang and AppleClang
============================== ==============================
19.04.16 Release CLHEP-2.3.2.1 19.04.16 Release CLHEP-2.3.2.1
============================== ==============================
......
============================== ==============================
22.04.16 Release CLHEP-2.3.2.2
==============================
==============================
19.04.16 Release CLHEP-2.3.2.1 19.04.16 Release CLHEP-2.3.2.1
============================== ==============================
============================== ==============================
......
============================== ==============================
22.04.16 Release CLHEP-2.3.2.2
==============================
==============================
19.04.16 Release CLHEP-2.3.2.1 19.04.16 Release CLHEP-2.3.2.1
============================== ==============================
============================== ==============================
......
============================== ==============================
22.04.16 Release CLHEP-2.3.2.2
==============================
==============================
19.04.16 Release CLHEP-2.3.2.1 19.04.16 Release CLHEP-2.3.2.1
============================== ==============================
============================== ==============================
......
============================== ==============================
22.04.16 Release CLHEP-2.3.2.2
==============================
==============================
19.04.16 Release CLHEP-2.3.2.1 19.04.16 Release CLHEP-2.3.2.1
============================== ==============================
============================== ==============================
......
============================== ==============================
22.04.16 Release CLHEP-2.3.2.2
==============================
==============================
19.04.16 Release CLHEP-2.3.2.1 19.04.16 Release CLHEP-2.3.2.1
============================== ==============================
============================== ==============================
......
============================== ==============================
22.04.16 Release CLHEP-2.3.2.2
==============================
==============================
19.04.16 Release CLHEP-2.3.2.1 19.04.16 Release CLHEP-2.3.2.1
============================== ==============================
============================== ==============================
......
============================== ==============================
22.04.16 Release CLHEP-2.3.2.2
==============================
==============================
19.04.16 Release CLHEP-2.3.2.1 19.04.16 Release CLHEP-2.3.2.1
============================== ==============================
......
============================== ==============================
22.04.16 Release CLHEP-2.3.2.2
==============================
==============================
19.04.16 Release CLHEP-2.3.2.1 19.04.16 Release CLHEP-2.3.2.1
============================== ==============================
============================== ==============================
......
============================== ==============================
22.04.16 Release CLHEP-2.3.2.2
==============================
==============================
19.04.16 Release CLHEP-2.3.2.1 19.04.16 Release CLHEP-2.3.2.1
============================== ==============================
============================== ==============================
......
============================== ==============================
22.04.16 Release CLHEP-2.3.2.2
==============================
==============================
19.04.16 Release CLHEP-2.3.2.1 19.04.16 Release CLHEP-2.3.2.1
============================== ==============================
......
============================== ==============================
22.04.16 Release CLHEP-2.3.2.2
==============================
==============================
19.04.16 Release CLHEP-2.3.2.1 19.04.16 Release CLHEP-2.3.2.1
============================== ==============================
============================== ==============================
......
...@@ -95,6 +95,12 @@ macro( _clhep_verify_cxx11 ) ...@@ -95,6 +95,12 @@ macro( _clhep_verify_cxx11 )
else() else()
set( HAVE_STDCXX true ) set( HAVE_STDCXX true )
endif() endif()
elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang" )
if( CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5 )
message( FATAL_ERROR "CLHEP now requires c++11 support with clang 3.5 or later")
else()
set( HAVE_STDCXX true )
endif()
elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel" ) elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel" )
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14.0) if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14.0)
message( FATAL_ERROR "c++11 extension is not available for ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") message( FATAL_ERROR "c++11 extension is not available for ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
...@@ -119,6 +125,12 @@ macro( _clhep_verify_cxx1y ) ...@@ -119,6 +125,12 @@ macro( _clhep_verify_cxx1y )
else() else()
set( HAVE_STDCXX true ) set( HAVE_STDCXX true )
endif() endif()
elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang" )
if( CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5 )
message( FATAL_ERROR "c++1y extension is not available for ${CMAKE_CXX_COMPILER_ID}${CMAKE_CXX_COMPILER_VERSION}")
else()
set( HAVE_STDCXX true )
endif()
elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel" ) elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel" )
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0) if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0)
message( FATAL_ERROR "c++11 extension is not available for ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") message( FATAL_ERROR "c++11 extension is not available for ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
...@@ -143,6 +155,12 @@ macro( _clhep_verify_cxx14 ) ...@@ -143,6 +155,12 @@ macro( _clhep_verify_cxx14 )
else() else()
set( HAVE_STDCXX true ) set( HAVE_STDCXX true )
endif() endif()
elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang" )
if( CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5 )
message( FATAL_ERROR "c++14 extension is not available for ${CMAKE_CXX_COMPILER_ID}${CMAKE_CXX_COMPILER_VERSION}")
else()
set( HAVE_STDCXX true )
endif()
elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel" ) elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel" )
if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16.0) if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16.0)
message( FATAL_ERROR "c++14 extension is not available for ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") message( FATAL_ERROR "c++14 extension is not available for ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
...@@ -188,6 +206,8 @@ macro( _clhep_check_cxxstd ) ...@@ -188,6 +206,8 @@ macro( _clhep_check_cxxstd )
if( DEFINED HAVE_STDCXX ) if( DEFINED HAVE_STDCXX )
if( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" ) if( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CLHEP_BUILD_CXXSTD}" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CLHEP_BUILD_CXXSTD}" )
elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang" )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CLHEP_BUILD_CXXSTD}" )
elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel" ) elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel" )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CLHEP_BUILD_CXXSTD" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CLHEP_BUILD_CXXSTD" )
elseif(CMAKE_COMPILER_IS_GNUCXX) elseif(CMAKE_COMPILER_IS_GNUCXX)
...@@ -227,6 +247,8 @@ macro( clhep_set_compiler_flags ) ...@@ -227,6 +247,8 @@ macro( clhep_set_compiler_flags )
endif( CLHEP_DEBUG_MESSAGES ) endif( CLHEP_DEBUG_MESSAGES )
if( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" ) if( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" )
set(CMAKE_C_FLAGS "-O -pedantic -Wall ${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS "-O -pedantic -Wall ${CMAKE_C_FLAGS}")
elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang" )
set(CMAKE_C_FLAGS "-O -pedantic -Wall ${CMAKE_C_FLAGS}")
elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel" ) elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel" )
set(CMAKE_C_FLAGS "-O -ansi -pedantic -Wall {CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS "-O -ansi -pedantic -Wall {CMAKE_C_FLAGS}")
set(CMAKE_CXX_FLAGS "-O -ansi -pedantic -Wall ${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "-O -ansi -pedantic -Wall ${CMAKE_CXX_FLAGS}")
...@@ -235,6 +257,8 @@ macro( clhep_set_compiler_flags ) ...@@ -235,6 +257,8 @@ macro( clhep_set_compiler_flags )
endif() endif()
if( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" ) if( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" )
set(CMAKE_CXX_FLAGS "-O -pedantic -Wall ${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "-O -pedantic -Wall ${CMAKE_CXX_FLAGS}")
elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang" )
set(CMAKE_CXX_FLAGS "-O -pedantic -Wall ${CMAKE_CXX_FLAGS}")
elseif(CMAKE_COMPILER_IS_GNUCXX) elseif(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "-O -ansi -pedantic -Wall -D_GNU_SOURCE ${CMAKE_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "-O -ansi -pedantic -Wall -D_GNU_SOURCE ${CMAKE_CXX_FLAGS}")
endif() endif()
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# Project related configuration options # Project related configuration options
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
PROJECT_NAME = CLHEP PROJECT_NAME = CLHEP
PROJECT_NUMBER = 2.3.2.1 PROJECT_NUMBER = 2.3.2.2
OUTPUT_DIRECTORY = OUTPUT_DIRECTORY =
CREATE_SUBDIRS = NO CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English OUTPUT_LANGUAGE = English
......
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