COMP/CMSDIST/clhep-2.1.1.0-fix-cmake.patch

diff --git a/CLHEP/cmake/Modules/ClhepCopyHeaders.cmake b/CLHEP/cmake/Modules/ClhepCopyHeaders.cmake
index 56b1770..707f3cc 100644
--- a/CLHEP/cmake/Modules/ClhepCopyHeaders.cmake
+++ b/CLHEP/cmake/Modules/ClhepCopyHeaders.cmake
@@ -22,7 +22,7 @@ macro (clhep_copy_headers )
                 ${CLHEP_SOURCE_DIR}/${package}/${package}/*.icc )
      FILE( GLOB defs ${CLHEP_SOURCE_DIR}/${package}/${package}/cmake-defs.h.in )
      foreach( defhdr ${defs} )
-       ##message(STATUS "process ${defhdr} to create ${CLHEP_BINARY_DIR}/CLHEP/${package}/defs.h")
+       message(STATUS "process ${defhdr} to create ${CLHEP_BINARY_DIR}/CLHEP/${package}/defs.h")
        # this copies the file and creates directories if necessary
        CONFIGURE_FILE( ${defhdr} ${CLHEP_BINARY_DIR}/CLHEP/${package}/defs.h  @ONLY )
        # install defs.h from here
@@ -31,8 +31,12 @@ macro (clhep_copy_headers )
      endforeach( defhdr )
 
      foreach( hdr ${headers} )
-       STRING( REGEX REPLACE "^(${CMAKE_CURRENT_SOURCE_DIR})/${package}(.*)$"  "${CLHEP_BINARY_DIR}/CLHEP\\2" output_file "${hdr}")
-       ##message(STATUS "moving ${hdr} to ${output_file}")
+       string(LENGTH "${CMAKE_CURRENT_SOURCE_DIR}/" SOURCE_DIR_LEN)
+       string(LENGTH "${package}/" PACKAGE_LEN)
+       math(EXPR CUT_POS "${SOURCE_DIR_LEN} + ${PACKAGE_LEN}")
+       string(SUBSTRING "${hdr}" ${CUT_POS} -1 HEADER_FILE)
+       set(output_file "${CLHEP_BINARY_DIR}/CLHEP/${HEADER_FILE}")
+       message(STATUS "moving ${hdr} to ${output_file}")
        # this copies the file and creates directories if necessary
        CONFIGURE_FILE( ${hdr} ${output_file}  COPYONLY)
      endforeach( hdr )
diff --git a/CLHEP/cmake/Modules/ClhepOutOfSourceBuild.cmake b/CLHEP/cmake/Modules/ClhepOutOfSourceBuild.cmake
index 3054c32..9f5afa1 100644
--- a/CLHEP/cmake/Modules/ClhepOutOfSourceBuild.cmake
+++ b/CLHEP/cmake/Modules/ClhepOutOfSourceBuild.cmake
@@ -5,8 +5,8 @@
 macro (clhep_ensure_out_of_source_build)
 
   string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" in_source)
-  string( REGEX MATCH "${CMAKE_SOURCE_DIR}/" in_source_subdir "${CMAKE_BINARY_DIR}")
-  if (in_source OR in_source_subdir)
+  string(FIND "${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}" in_source_subdir)
+  if (in_source OR in_source_subdir GREATER -1)
   message(FATAL_ERROR "
 ERROR: In source builds of this project are not allowed.
 A separate build directory is required.
diff --git a/CLHEP/cmake/Modules/ClhepVariables.cmake b/CLHEP/cmake/Modules/ClhepVariables.cmake
index f10262f..c5e2850 100644
--- a/CLHEP/cmake/Modules/ClhepVariables.cmake
+++ b/CLHEP/cmake/Modules/ClhepVariables.cmake
@@ -86,10 +86,10 @@ macro( clhep_set_compiler_flags )
   endif()
   message(STATUS "cmake build type is ${CMAKE_BUILD_TYPE}")
   if( CMAKE_COMPILER_IS_GNUCC )
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O -ansi -pedantic -Wall -D_GNU_SOURCE")
+    set(CMAKE_C_FLAGS "-O -ansi -pedantic -Wall -D_GNU_SOURCE ${CMAKE_C_FLAGS}")
   endif(CMAKE_COMPILER_IS_GNUCC)
   if(CMAKE_COMPILER_IS_GNUCXX)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O -ansi -pedantic -Wall -D_GNU_SOURCE")
+    set(CMAKE_CXX_FLAGS "-O -ansi -pedantic -Wall -D_GNU_SOURCE ${CMAKE_CXX_FLAGS}")
   endif(CMAKE_COMPILER_IS_GNUCXX)
   if( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
     ##message( STATUS "system is Windows" )
#	User	Rev	Content
1	davidlt	1.1	diff --git a/CLHEP/cmake/Modules/ClhepCopyHeaders.cmake b/CLHEP/cmake/Modules/ClhepCopyHeaders.cmake
2			index 56b1770..707f3cc 100644
3			--- a/CLHEP/cmake/Modules/ClhepCopyHeaders.cmake
4			+++ b/CLHEP/cmake/Modules/ClhepCopyHeaders.cmake
5			@@ -22,7 +22,7 @@ macro (clhep_copy_headers )
6			${CLHEP_SOURCE_DIR}/${package}/${package}/*.icc )
7			FILE( GLOB defs ${CLHEP_SOURCE_DIR}/${package}/${package}/cmake-defs.h.in )
8			foreach( defhdr ${defs} )
9			- ##message(STATUS "process ${defhdr} to create ${CLHEP_BINARY_DIR}/CLHEP/${package}/defs.h")
10			+ message(STATUS "process ${defhdr} to create ${CLHEP_BINARY_DIR}/CLHEP/${package}/defs.h")
11			# this copies the file and creates directories if necessary
12			CONFIGURE_FILE( ${defhdr} ${CLHEP_BINARY_DIR}/CLHEP/${package}/defs.h @ONLY )
13			# install defs.h from here
14			@@ -31,8 +31,12 @@ macro (clhep_copy_headers )
15			endforeach( defhdr )
16
17			foreach( hdr ${headers} )
18			- STRING( REGEX REPLACE "^(${CMAKE_CURRENT_SOURCE_DIR})/${package}(.*)$" "${CLHEP_BINARY_DIR}/CLHEP\\2" output_file "${hdr}")
19			- ##message(STATUS "moving ${hdr} to ${output_file}")
20			+ string(LENGTH "${CMAKE_CURRENT_SOURCE_DIR}/" SOURCE_DIR_LEN)
21			+ string(LENGTH "${package}/" PACKAGE_LEN)
22			+ math(EXPR CUT_POS "${SOURCE_DIR_LEN} + ${PACKAGE_LEN}")
23			+ string(SUBSTRING "${hdr}" ${CUT_POS} -1 HEADER_FILE)
24			+ set(output_file "${CLHEP_BINARY_DIR}/CLHEP/${HEADER_FILE}")
25			+ message(STATUS "moving ${hdr} to ${output_file}")
26			# this copies the file and creates directories if necessary
27			CONFIGURE_FILE( ${hdr} ${output_file} COPYONLY)
28			endforeach( hdr )
29			diff --git a/CLHEP/cmake/Modules/ClhepOutOfSourceBuild.cmake b/CLHEP/cmake/Modules/ClhepOutOfSourceBuild.cmake
30			index 3054c32..9f5afa1 100644
31			--- a/CLHEP/cmake/Modules/ClhepOutOfSourceBuild.cmake
32			+++ b/CLHEP/cmake/Modules/ClhepOutOfSourceBuild.cmake
33			@@ -5,8 +5,8 @@
34			macro (clhep_ensure_out_of_source_build)
35
36			string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" in_source)
37			- string( REGEX MATCH "${CMAKE_SOURCE_DIR}/" in_source_subdir "${CMAKE_BINARY_DIR}")
38			- if (in_source OR in_source_subdir)
39			+ string(FIND "${CMAKE_BINARY_DIR}" "${CMAKE_SOURCE_DIR}" in_source_subdir)
40			+ if (in_source OR in_source_subdir GREATER -1)
41			message(FATAL_ERROR "
42			ERROR: In source builds of this project are not allowed.
43			A separate build directory is required.
44			diff --git a/CLHEP/cmake/Modules/ClhepVariables.cmake b/CLHEP/cmake/Modules/ClhepVariables.cmake
45			index f10262f..c5e2850 100644
46			--- a/CLHEP/cmake/Modules/ClhepVariables.cmake
47			+++ b/CLHEP/cmake/Modules/ClhepVariables.cmake
48			@@ -86,10 +86,10 @@ macro( clhep_set_compiler_flags )
49			endif()
50			message(STATUS "cmake build type is ${CMAKE_BUILD_TYPE}")
51			if( CMAKE_COMPILER_IS_GNUCC )
52			- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O -ansi -pedantic -Wall -D_GNU_SOURCE")
53			+ set(CMAKE_C_FLAGS "-O -ansi -pedantic -Wall -D_GNU_SOURCE ${CMAKE_C_FLAGS}")
54			endif(CMAKE_COMPILER_IS_GNUCC)
55			if(CMAKE_COMPILER_IS_GNUCXX)
56			- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O -ansi -pedantic -Wall -D_GNU_SOURCE")
57			+ set(CMAKE_CXX_FLAGS "-O -ansi -pedantic -Wall -D_GNU_SOURCE ${CMAKE_CXX_FLAGS}")
58			endif(CMAKE_COMPILER_IS_GNUCXX)
59			if( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
60			##message( STATUS "system is Windows" )