Commit 2c5b775a authored by Lynn Garren's avatar Lynn Garren
Browse files

Merge tag 'CLHEP_2_3_4_1' into develop

improvements for Apple Clang
parents 1fc92605 a0ade434
......@@ -31,7 +31,7 @@ clhep_ensure_out_of_source_build()
# use cmake 3.2 or later
cmake_minimum_required(VERSION 3.2)
# Project setup
project(CLHEP VERSION 2.3.4.0)
project(CLHEP VERSION 2.3.4.1)
# - needed for (temporary) back compatibility
set(VERSION ${PROJECT_VERSION})
......
==============================
22.11.16 Release CLHEP-2.3.4.1
==============================
2016-11-22 Lynn Garren <garren@fnal.gov>
* cmake: bug fix for Apple Clang
Multithreading will be enabled when building with gcc,
Multithreading will be enabled for Apple Clang is 8.0 or later.
Multithreading will be enabled for Clang is 3.5 or later.
==============================
18.11.16 Release CLHEP-2.3.4.0
==============================
......
==============================
22.11.16 Release CLHEP-2.3.4.1
==============================
==============================
18.11.16 Release CLHEP-2.3.4.0
==============================
......
==============================
22.11.16 Release CLHEP-2.3.4.1
==============================
==============================
18.11.16 Release CLHEP-2.3.4.0
==============================
==============================
......
==============================
22.11.16 Release CLHEP-2.3.4.1
==============================
==============================
18.11.16 Release CLHEP-2.3.4.0
==============================
==============================
......
==============================
22.11.16 Release CLHEP-2.3.4.1
==============================
==============================
18.11.16 Release CLHEP-2.3.4.0
==============================
==============================
......
==============================
22.11.16 Release CLHEP-2.3.4.1
==============================
==============================
18.11.16 Release CLHEP-2.3.4.0
==============================
==============================
......
==============================
22.11.16 Release CLHEP-2.3.4.1
==============================
==============================
18.11.16 Release CLHEP-2.3.4.0
==============================
==============================
......
==============================
22.11.16 Release CLHEP-2.3.4.1
==============================
==============================
18.11.16 Release CLHEP-2.3.4.0
==============================
......
==============================
22.11.16 Release CLHEP-2.3.4.1
==============================
==============================
18.11.16 Release CLHEP-2.3.4.0
==============================
==============================
......
==============================
22.11.16 Release CLHEP-2.3.4.1
==============================
==============================
18.11.16 Release CLHEP-2.3.4.0
==============================
==============================
......
==============================
22.11.16 Release CLHEP-2.3.4.1
==============================
==============================
18.11.16 Release CLHEP-2.3.4.0
==============================
......
==============================
22.11.16 Release CLHEP-2.3.4.1
==============================
==============================
18.11.16 Release CLHEP-2.3.4.0
==============================
==============================
......
......@@ -102,8 +102,8 @@ macro( _clhep_verify_cxx11 )
set( HAVE_STDCXX true )
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")
if( CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0 )
message( FATAL_ERROR "CLHEP now requires c++11 support with Apple Clang 6.0 or later")
else()
set( HAVE_STDCXX true )
endif()
......@@ -132,7 +132,7 @@ macro( _clhep_verify_cxx1y )
set( HAVE_STDCXX true )
endif()
elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang" )
if( CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5 )
if( CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0 )
message( FATAL_ERROR "c++1y extension is not available for ${CMAKE_CXX_COMPILER_ID}${CMAKE_CXX_COMPILER_VERSION}")
else()
set( HAVE_STDCXX true )
......@@ -162,7 +162,7 @@ macro( _clhep_verify_cxx14 )
set( HAVE_STDCXX true )
endif()
elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang" )
if( CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5 )
if( CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0 )
message( FATAL_ERROR "c++14 extension is not available for ${CMAKE_CXX_COMPILER_ID}${CMAKE_CXX_COMPILER_VERSION}")
else()
set( HAVE_STDCXX true )
......@@ -255,6 +255,12 @@ macro( clhep_set_compiler_flags )
else()
_clhep_use_pthread()
endif()
elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" )
if( CMAKE_CXX_COMPILER_VERSION VERSION_LESS 3.5 )
set(CLHEP_THREAD_DEFINITION "#define CLHEP_THREAD_LOCAL")
else()
_clhep_use_pthread()
endif()
else()
set(CLHEP_THREAD_DEFINITION "#define CLHEP_THREAD_LOCAL")
endif()
......
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