Merge branch 'release/CLHEP_2_3_4_2'

0928df48 · Lynn Garren · a0ade434 · b0800325 · 0928df48 · 0928df48
Commit 0928df48 authored Nov 23, 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.1)
+project(CLHEP VERSION 2.3.4.2)
 # - needed for (temporary) back compatibility
 set(VERSION ${PROJECT_VERSION})


--- a/ChangeLog
+++ b/ChangeLog
 ==============================
+23.11.16 Release CLHEP-2.3.4.2
+==============================
+==============================
 22.11.16 Release CLHEP-2.3.4.1
 ==============================


--- a/Evaluator/ChangeLog
+++ b/Evaluator/ChangeLog
 ==============================
+23.11.16 Release CLHEP-2.3.4.2
+==============================
+==============================
 22.11.16 Release CLHEP-2.3.4.1
 ==============================
 ==============================

--- a/Exceptions/ChangeLog
+++ b/Exceptions/ChangeLog
 ==============================
+23.11.16 Release CLHEP-2.3.4.2
+==============================
+==============================
 22.11.16 Release CLHEP-2.3.4.1
 ==============================
 ==============================

--- a/Fields/ChangeLog
+++ b/Fields/ChangeLog
 ==============================
+23.11.16 Release CLHEP-2.3.4.2
+==============================
+==============================
 22.11.16 Release CLHEP-2.3.4.1
 ==============================
 ==============================

--- a/GenericFunctions/ChangeLog
+++ b/GenericFunctions/ChangeLog
 ==============================
+23.11.16 Release CLHEP-2.3.4.2
+==============================
+==============================
 22.11.16 Release CLHEP-2.3.4.1
 ==============================
 ==============================

--- a/Geometry/ChangeLog
+++ b/Geometry/ChangeLog
 ==============================
+23.11.16 Release CLHEP-2.3.4.2
+==============================
+==============================
 22.11.16 Release CLHEP-2.3.4.1
 ==============================
 ==============================

--- a/Matrix/ChangeLog
+++ b/Matrix/ChangeLog
 ==============================
+23.11.16 Release CLHEP-2.3.4.2
+==============================
+==============================
 22.11.16 Release CLHEP-2.3.4.1
 ==============================
 ==============================

--- a/Random/ChangeLog
+++ b/Random/ChangeLog
 ==============================
+23.11.16 Release CLHEP-2.3.4.2
+==============================
+==============================
 22.11.16 Release CLHEP-2.3.4.1
 ==============================
 ==============================

--- a/RandomObjects/ChangeLog
+++ b/RandomObjects/ChangeLog
 ==============================
+23.11.16 Release CLHEP-2.3.4.2
+==============================
+==============================
 22.11.16 Release CLHEP-2.3.4.1
 ==============================
 ==============================

--- a/Units/ChangeLog
+++ b/Units/ChangeLog
 ==============================
+23.11.16 Release CLHEP-2.3.4.2
+==============================
+==============================
 22.11.16 Release CLHEP-2.3.4.1
 ==============================
 ==============================

--- a/Utility/ChangeLog
+++ b/Utility/ChangeLog
+==============================
+23.11.16 Release CLHEP-2.3.4.2
+==============================
+
+2016-11-23 Lynn Garren <garren@fnal.gov> 
+
+  * Utility/thread_local.h fix bug in install 
+
 ==============================
 22.11.16 Release CLHEP-2.3.4.1
 ==============================

--- a/Utility/Utility/CMakeLists.txt
+++ b/Utility/Utility/CMakeLists.txt
@@ -12,4 +12,4 @@ INSTALL (FILES ${pkginclude_HEADERS}
 CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/thread_local.in
                 ${CLHEP_BINARY_DIR}/CLHEP/Utility/thread_local.h @ONLY)
 INSTALL ( FILES  ${CLHEP_BINARY_DIR}/CLHEP/Utility/thread_local.h 
-         DESTINATION include/CLHEP/Utility/thread_local.h )
+         DESTINATION include/CLHEP/Utility )
--- a/Vector/ChangeLog
+++ b/Vector/ChangeLog
 ==============================
+23.11.16 Release CLHEP-2.3.4.2
+==============================
+==============================
 22.11.16 Release CLHEP-2.3.4.1
 ==============================
 ==============================