Merge branch 'release/CLHEP_2_3_4_3'

83134c37 · Lynn Garren · 0928df48 · 0b8d2dde · 83134c37 · 83134c37
Commit 83134c37 authored Nov 30, 2016 by Lynn Garren
14 changed files
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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.2)
+project(CLHEP VERSION 2.3.4.3)
 # - needed for (temporary) back compatibility
 set(VERSION ${PROJECT_VERSION})


--- a/ChangeLog
+++ b/ChangeLog
+==============================
+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
 ==============================

--- a/Evaluator/ChangeLog
+++ b/Evaluator/ChangeLog
 ==============================
+30.11.16 Release CLHEP-2.3.4.3
+==============================
+==============================
 23.11.16 Release CLHEP-2.3.4.2
 ==============================
 ==============================

--- a/Exceptions/ChangeLog
+++ b/Exceptions/ChangeLog
 ==============================
+30.11.16 Release CLHEP-2.3.4.3
+==============================
+==============================
 23.11.16 Release CLHEP-2.3.4.2
 ==============================
 ==============================

--- a/Fields/ChangeLog
+++ b/Fields/ChangeLog
 ==============================
+30.11.16 Release CLHEP-2.3.4.3
+==============================
+==============================
 23.11.16 Release CLHEP-2.3.4.2
 ==============================
 ==============================

--- a/GenericFunctions/ChangeLog
+++ b/GenericFunctions/ChangeLog
 ==============================
+30.11.16 Release CLHEP-2.3.4.3
+==============================
+==============================
 23.11.16 Release CLHEP-2.3.4.2
 ==============================
 ==============================

--- a/Geometry/ChangeLog
+++ b/Geometry/ChangeLog
 ==============================
+30.11.16 Release CLHEP-2.3.4.3
+==============================
+==============================
 23.11.16 Release CLHEP-2.3.4.2
 ==============================
 ==============================

--- a/Matrix/ChangeLog
+++ b/Matrix/ChangeLog
 ==============================
+30.11.16 Release CLHEP-2.3.4.3
+==============================
+==============================
 23.11.16 Release CLHEP-2.3.4.2
 ==============================
 ==============================

--- a/Random/ChangeLog
+++ b/Random/ChangeLog
 ==============================
+30.11.16 Release CLHEP-2.3.4.3
+==============================
+==============================
 23.11.16 Release CLHEP-2.3.4.2
 ==============================
 ==============================

--- a/RandomObjects/ChangeLog
+++ b/RandomObjects/ChangeLog
 ==============================
+30.11.16 Release CLHEP-2.3.4.3
+==============================
+==============================
 23.11.16 Release CLHEP-2.3.4.2
 ==============================
 ==============================

--- a/Units/ChangeLog
+++ b/Units/ChangeLog
 ==============================
+30.11.16 Release CLHEP-2.3.4.3
+==============================
+==============================
 23.11.16 Release CLHEP-2.3.4.2
 ==============================
 ==============================

--- a/Utility/ChangeLog
+++ b/Utility/ChangeLog
 ==============================
+30.11.16 Release CLHEP-2.3.4.3
+==============================
+==============================
 23.11.16 Release CLHEP-2.3.4.2
 ==============================


--- a/Vector/ChangeLog
+++ b/Vector/ChangeLog
 ==============================
+30.11.16 Release CLHEP-2.3.4.3
+==============================
+==============================
 23.11.16 Release CLHEP-2.3.4.2
 ==============================
 ==============================

--- a/cmake/Modules/ClhepVariables.cmake
+++ b/cmake/Modules/ClhepVariables.cmake
@@ -261,6 +261,8 @@ macro( clhep_set_compiler_flags )
    else()
      _clhep_use_pthread()
    endif()
+  elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel" )
+    _clhep_use_pthread()
  else()
    set(CLHEP_THREAD_DEFINITION "#define CLHEP_THREAD_LOCAL")
  endif()