Commit 83134c37 authored by Lynn Garren's avatar Lynn Garren
Browse files

Merge branch 'release/CLHEP_2_3_4_3'

parents 0928df48 0b8d2dde
...@@ -31,7 +31,7 @@ clhep_ensure_out_of_source_build() ...@@ -31,7 +31,7 @@ clhep_ensure_out_of_source_build()
# use cmake 3.2 or later # use cmake 3.2 or later
cmake_minimum_required(VERSION 3.2) cmake_minimum_required(VERSION 3.2)
# Project setup # Project setup
project(CLHEP VERSION 2.3.4.2) project(CLHEP VERSION 2.3.4.3)
# - needed for (temporary) back compatibility # - needed for (temporary) back compatibility
set(VERSION ${PROJECT_VERSION}) set(VERSION ${PROJECT_VERSION})
......
==============================
30.11.16 Release CLHEP-2.3.4.3
==============================
2016-11-30 Lynn Garren <garren@fnal.gov>
* cmake: bug fix for the Intel compiler to allow multithreading
============================== ==============================
23.11.16 Release CLHEP-2.3.4.2 23.11.16 Release CLHEP-2.3.4.2
============================== ==============================
......
============================== ==============================
30.11.16 Release CLHEP-2.3.4.3
==============================
==============================
23.11.16 Release CLHEP-2.3.4.2 23.11.16 Release CLHEP-2.3.4.2
============================== ==============================
============================== ==============================
......
============================== ==============================
30.11.16 Release CLHEP-2.3.4.3
==============================
==============================
23.11.16 Release CLHEP-2.3.4.2 23.11.16 Release CLHEP-2.3.4.2
============================== ==============================
============================== ==============================
......
============================== ==============================
30.11.16 Release CLHEP-2.3.4.3
==============================
==============================
23.11.16 Release CLHEP-2.3.4.2 23.11.16 Release CLHEP-2.3.4.2
============================== ==============================
============================== ==============================
......
============================== ==============================
30.11.16 Release CLHEP-2.3.4.3
==============================
==============================
23.11.16 Release CLHEP-2.3.4.2 23.11.16 Release CLHEP-2.3.4.2
============================== ==============================
============================== ==============================
......
============================== ==============================
30.11.16 Release CLHEP-2.3.4.3
==============================
==============================
23.11.16 Release CLHEP-2.3.4.2 23.11.16 Release CLHEP-2.3.4.2
============================== ==============================
============================== ==============================
......
============================== ==============================
30.11.16 Release CLHEP-2.3.4.3
==============================
==============================
23.11.16 Release CLHEP-2.3.4.2 23.11.16 Release CLHEP-2.3.4.2
============================== ==============================
============================== ==============================
......
============================== ==============================
30.11.16 Release CLHEP-2.3.4.3
==============================
==============================
23.11.16 Release CLHEP-2.3.4.2 23.11.16 Release CLHEP-2.3.4.2
============================== ==============================
============================== ==============================
......
============================== ==============================
30.11.16 Release CLHEP-2.3.4.3
==============================
==============================
23.11.16 Release CLHEP-2.3.4.2 23.11.16 Release CLHEP-2.3.4.2
============================== ==============================
============================== ==============================
......
============================== ==============================
30.11.16 Release CLHEP-2.3.4.3
==============================
==============================
23.11.16 Release CLHEP-2.3.4.2 23.11.16 Release CLHEP-2.3.4.2
============================== ==============================
============================== ==============================
......
============================== ==============================
30.11.16 Release CLHEP-2.3.4.3
==============================
==============================
23.11.16 Release CLHEP-2.3.4.2 23.11.16 Release CLHEP-2.3.4.2
============================== ==============================
......
============================== ==============================
30.11.16 Release CLHEP-2.3.4.3
==============================
==============================
23.11.16 Release CLHEP-2.3.4.2 23.11.16 Release CLHEP-2.3.4.2
============================== ==============================
============================== ==============================
......
...@@ -261,6 +261,8 @@ macro( clhep_set_compiler_flags ) ...@@ -261,6 +261,8 @@ macro( clhep_set_compiler_flags )
else() else()
_clhep_use_pthread() _clhep_use_pthread()
endif() endif()
elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel" )
_clhep_use_pthread()
else() else()
set(CLHEP_THREAD_DEFINITION "#define CLHEP_THREAD_LOCAL") set(CLHEP_THREAD_DEFINITION "#define CLHEP_THREAD_LOCAL")
endif() 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