make sure the defs.h files match

c0095cdc · Lynn Garren · ebcaae97 · c0095cdc · c0095cdc · c0095cdc
Commit c0095cdc authored Jul 12, 2011 by Lynn Garren
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,7 @@ include(CopyHeaders)
 include(BuildTest)
 include(BuildLibrary)
 include(ClhepVariables)
+include(CheckFunctionExists)

 # make sure we are not building in source
 clhep_ensure_out_of_source_build()
@@ -55,9 +56,11 @@ clhep_set_compiler_flags()
 # get automake/autoconf variables
 clhep_autoconf_variables()

-
-clhep_copy_headers( Units Utility Vector Evaluator GenericFunctions Geometry
+# check for required functions
+CHECK_FUNCTION_EXISTS(drand48 found_drand48)
+set( CLHEP_subdirs Units Utility Vector Evaluator GenericFunctions Geometry
                    Random Matrix RandomObjects Cast RefCount Exceptions )
+clhep_copy_headers( ${CLHEP_subdirs} )

 subdirs(Units)
 subdirs(Utility) 

--- a/Cast/Cast/cmake-defs.h.in
+++ b/Cast/Cast/cmake-defs.h.in
 /* @PACKAGE@/defs.h  Generated by cmake.  */

-#ifndef @PACKAGE@_DEFS_H
-#define @PACKAGE@_DEFS_H
+#ifndef @UPACKAGE@_DEFS_H
+#define @UPACKAGE@_DEFS_H

 /* Name of package */
 #ifndef PACKAGE
@@ -33,12 +33,9 @@
 #define PACKAGE_VERSION "@VERSION@"
 #endif

-/* building with Visual C++ */
-/* #undef USING_VISUAL */
-
 /* Version number of package */
 #ifndef VERSION
 #define VERSION "@VERSION@"
 #endif

-#endif  // @PACKAGE@_DEFS_H
+#endif  // @UPACKAGE@_DEFS_H
--- a/Evaluator/Evaluator/cmake-defs.h.in
+++ b/Evaluator/Evaluator/cmake-defs.h.in
 /* @PACKAGE@/defs.h  Generated by cmake.  */

-#ifndef @PACKAGE@_DEFS_H
-#define @PACKAGE@_DEFS_H
+#ifndef @UPACKAGE@_DEFS_H
+#define @UPACKAGE@_DEFS_H

 /* Name of package */
 #ifndef PACKAGE
@@ -33,12 +33,9 @@
 #define PACKAGE_VERSION "@VERSION@"
 #endif

-/* building with Visual C++ */
-/* #undef USING_VISUAL */
-
 /* Version number of package */
 #ifndef VERSION
 #define VERSION "@VERSION@"
 #endif

-#endif  // @PACKAGE@_DEFS_H
+#endif  // @UPACKAGE@_DEFS_H
--- a/Exceptions/Exceptions/cmake-defs.h.in
+++ b/Exceptions/Exceptions/cmake-defs.h.in
 /* @PACKAGE@/defs.h  Generated by cmake.  */

-#ifndef @PACKAGE@_DEFS_H
-#define @PACKAGE@_DEFS_H
+#ifndef @UPACKAGE@_DEFS_H
+#define @UPACKAGE@_DEFS_H

 /* Name of package */
 #ifndef PACKAGE
@@ -33,12 +33,9 @@
 #define PACKAGE_VERSION "@VERSION@"
 #endif

-/* building with Visual C++ */
-/* #undef USING_VISUAL */
-
 /* Version number of package */
 #ifndef VERSION
 #define VERSION "@VERSION@"
 #endif

-#endif  // @PACKAGE@_DEFS_H
+#endif  // @UPACKAGE@_DEFS_H
--- a/GenericFunctions/GenericFunctions/CMakeLists.txt
+++ b/GenericFunctions/GenericFunctions/CMakeLists.txt
@@ -65,6 +65,7 @@ set( pkginclude_HEADERS AbsFunctional.hh
 			LogGamma.hh  
 			LogisticFunction.hh  
 			Mod.hh  
+			NonrelativisticBW.hh
 			ParameterComposition.hh  
 			ParameterDifference.hh  
 			Parameter.hh  
@@ -81,6 +82,7 @@ set( pkginclude_HEADERS AbsFunctional.hh
 			PuncturedSmearedExp.hh
 			RCBase.hh 
 			Rectangular.hh  
+			RelativisticBW.hh
 			ReverseExponential.hh  
 			RKIntegrator.hh  
 			Sigma.hh  
@@ -96,6 +98,7 @@ set( pkginclude_HEADERS AbsFunctional.hh
 			Tan.hh  
 			TrivariateGaussian.hh  
 			Variable.hh  
+			VoigtProfile.hh
 			X.hh )

 # notice that defs.h is not referenced here

--- a/GenericFunctions/GenericFunctions/cmake-defs.h.in
+++ b/GenericFunctions/GenericFunctions/cmake-defs.h.in
 /* @PACKAGE@/defs.h  Generated by cmake.  */

-#ifndef @PACKAGE@_DEFS_H
-#define @PACKAGE@_DEFS_H
+#ifndef @UPACKAGE@_DEFS_H
+#define @UPACKAGE@_DEFS_H

 /* Name of package */
 #ifndef PACKAGE
@@ -33,12 +33,9 @@
 #define PACKAGE_VERSION "@VERSION@"
 #endif

-/* building with Visual C++ */
-/* #undef USING_VISUAL */
-
 /* Version number of package */
 #ifndef VERSION
 #define VERSION "@VERSION@"
 #endif

-#endif  // @PACKAGE@_DEFS_H
+#endif  // @UPACKAGE@_DEFS_H
--- a/GenericFunctions/src/CMakeLists.txt
+++ b/GenericFunctions/src/CMakeLists.txt
@@ -50,6 +50,7 @@ clhep_build_library( GenericFunctions Abs.cc
 				      LogGamma.cc 
 				      LogisticFunction.cc 
 				      Mod.cc 
+				      NonrelativisticBW.cc
 				      Parameter.cc 
 				      ParameterComposition.cc 
 				      ParameterDifference.cc 
@@ -64,6 +65,7 @@ clhep_build_library( GenericFunctions Abs.cc
 				      PuncturedSmearedExp.cc
 				      RCBase.cc 
 				      Rectangular.cc 
+				      RelativisticBW.cc
 				      ReverseExponential.cc 
 				      RKIntegrator.cc 
 				      Sigma.cc
@@ -73,4 +75,5 @@ clhep_build_library( GenericFunctions Abs.cc
 				      Tan.cc 
 				      TrivariateGaussian.cc 
 				      Variable.cc 
+				      VoigtProfile.cc
 				      X.cc )
--- a/Geometry/Geometry/cmake-defs.h.in
+++ b/Geometry/Geometry/cmake-defs.h.in
 /* @PACKAGE@/defs.h  Generated by cmake.  */

-#ifndef @PACKAGE@_DEFS_H
-#define @PACKAGE@_DEFS_H
+#ifndef @UPACKAGE@_DEFS_H
+#define @UPACKAGE@_DEFS_H

 /* Name of package */
 #ifndef PACKAGE
@@ -33,12 +33,9 @@
 #define PACKAGE_VERSION "@VERSION@"
 #endif

-/* building with Visual C++ */
-/* #undef USING_VISUAL */
-
 /* Version number of package */
 #ifndef VERSION
 #define VERSION "@VERSION@"
 #endif

-#endif  // @PACKAGE@_DEFS_H
+#endif  // @UPACKAGE@_DEFS_H
--- a/Matrix/Matrix/cmake-defs.h.in
+++ b/Matrix/Matrix/cmake-defs.h.in
 /* @PACKAGE@/defs.h  Generated by cmake.  */

-#ifndef @PACKAGE@_DEFS_H
-#define @PACKAGE@_DEFS_H
+#ifndef @UPACKAGE@_DEFS_H
+#define @UPACKAGE@_DEFS_H

 /* disable non-compliant allocator */
 #ifndef DISABLE_ALLOC
@@ -38,12 +38,9 @@
 #define PACKAGE_VERSION "@VERSION@"
 #endif

-/* building with Visual C++ */
-/* #undef USING_VISUAL */
-
 /* Version number of package */
 #ifndef VERSION
 #define VERSION "@VERSION@"
 #endif

-#endif  // @PACKAGE@_DEFS_H
+#endif  // @UPACKAGE@_DEFS_H
--- a/Random/Random/cmake-defs.h.in
+++ b/Random/Random/cmake-defs.h.in
 /* @PACKAGE@/defs.h  Generated by cmake.  */

-#ifndef @PACKAGE@_DEFS_H
-#define @PACKAGE@_DEFS_H
+#ifndef @UPACKAGE@_DEFS_H
+#define @UPACKAGE@_DEFS_H
+
+/* Define to 1 if you have the `drand48' function. */
+@DRAND48_DEF@

 /* Name of package */
 #ifndef PACKAGE
@@ -33,12 +36,9 @@
 #define PACKAGE_VERSION "@VERSION@"
 #endif

-/* building with Visual C++ */
-/* #undef USING_VISUAL */
-
 /* Version number of package */
 #ifndef VERSION
 #define VERSION "@VERSION@"
 #endif

-#endif  // @PACKAGE@_DEFS_H
+#endif  // @UPACKAGE@_DEFS_H
--- a/RandomObjects/RandomObjects/cmake-defs.h.in
+++ b/RandomObjects/RandomObjects/cmake-defs.h.in
 /* @PACKAGE@/defs.h  Generated by cmake.  */

-#ifndef @PACKAGE@_DEFS_H
-#define @PACKAGE@_DEFS_H
+#ifndef @UPACKAGE@_DEFS_H
+#define @UPACKAGE@_DEFS_H

 /* Name of package */
 #ifndef PACKAGE
@@ -33,12 +33,9 @@
 #define PACKAGE_VERSION "@VERSION@"
 #endif

-/* building with Visual C++ */
-/* #undef USING_VISUAL */
-
 /* Version number of package */
 #ifndef VERSION
 #define VERSION "@VERSION@"
 #endif

-#endif  // @PACKAGE@_DEFS_H
+#endif  // @UPACKAGE@_DEFS_H
--- a/RefCount/RefCount/cmake-defs.h.in
+++ b/RefCount/RefCount/cmake-defs.h.in
 /* @PACKAGE@/defs.h  Generated by cmake.  */

-#ifndef @PACKAGE@_DEFS_H
-#define @PACKAGE@_DEFS_H
+#ifndef @UPACKAGE@_DEFS_H
+#define @UPACKAGE@_DEFS_H

 /* Name of package */
 #ifndef PACKAGE
@@ -33,12 +33,9 @@
 #define PACKAGE_VERSION "@VERSION@"
 #endif

-/* building with Visual C++ */
-/* #undef USING_VISUAL */
-
 /* Version number of package */
 #ifndef VERSION
 #define VERSION "@VERSION@"
 #endif

-#endif  // @PACKAGE@_DEFS_H
+#endif  // @UPACKAGE@_DEFS_H
--- a/Units/Units/cmake-defs.h.in
+++ b/Units/Units/cmake-defs.h.in
 /* @PACKAGE@/defs.h  Generated by cmake.  */

-#ifndef @PACKAGE@_DEFS_H
-#define @PACKAGE@_DEFS_H
+#ifndef @UPACKAGE@_DEFS_H
+#define @UPACKAGE@_DEFS_H

 /* Name of package */
 #ifndef PACKAGE
@@ -33,12 +33,9 @@
 #define PACKAGE_VERSION "@VERSION@"
 #endif

-/* building with Visual C++ */
-/* #undef USING_VISUAL */
-
 /* Version number of package */
 #ifndef VERSION
 #define VERSION "@VERSION@"
 #endif

-#endif  // @PACKAGE@_DEFS_H
+#endif  // @UPACKAGE@_DEFS_H
--- a/Utility/Utility/cmake-defs.h.in
+++ b/Utility/Utility/cmake-defs.h.in
 /* @PACKAGE@/defs.h  Generated by cmake.  */

-#ifndef @PACKAGE@_DEFS_H
-#define @PACKAGE@_DEFS_H
+#ifndef @UPACKAGE@_DEFS_H
+#define @UPACKAGE@_DEFS_H

 /* Name of package */
 #ifndef PACKAGE
@@ -33,12 +33,9 @@
 #define PACKAGE_VERSION "@VERSION@"
 #endif

-/* building with Visual C++ */
-/* #undef USING_VISUAL */
-
 /* Version number of package */
 #ifndef VERSION
 #define VERSION "@VERSION@"
 #endif

-#endif  // @PACKAGE@_DEFS_H
+#endif  // @UPACKAGE@_DEFS_H
--- a/Vector/Vector/cmake-defs.h.in
+++ b/Vector/Vector/cmake-defs.h.in
 /* @PACKAGE@/defs.h  Generated by cmake.  */

-#ifndef @PACKAGE@_DEFS_H
-#define @PACKAGE@_DEFS_H
+#ifndef @UPACKAGE@_DEFS_H
+#define @UPACKAGE@_DEFS_H

 /* Name of package */
 #ifndef PACKAGE
@@ -41,4 +41,4 @@
 #define VERSION "@VERSION@"
 #endif

-#endif  // @PACKAGE@_DEFS_H
+#endif  // @UPACKAGE@_DEFS_H
--- a/build-header.in
+++ b/build-header.in
@@ -42,6 +42,6 @@ echo "  };" >> ClhepVersion.h
 echo "" >> ClhepVersion.h
 echo "} // namespace" >> ClhepVersion.h
 echo "" >> ClhepVersion.h
-echo "#endif	// CLHEP_VERSION_H" >> ClhepVersion.h
+echo "#endif  // CLHEP_VERSION_H" >> ClhepVersion.h

 exit 0
--- a/cmake/Modules/ParseVersion.cmake
+++ b/cmake/Modules/ParseVersion.cmake
+# parse a version string and set the cmake project subversions
+#
+# parse_version( package version )
+
+macro( parse_version package vers )
+
+  # CLHEP versions have 4 numbers
+  STRING( REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+\\.[0-9]+.*" "\\1" ${package}_Major "${vers}" )
+  STRING( REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" ${package}_SubMajor "${vers}" )
+  STRING( REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" ${package}_Minor "${vers}" )
+  STRING( REGEX REPLACE "^[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" ${package}_SubMinor "${vers}" )
+  ##message(STATUS "version ${vers} parses to ${${package}_Major} ${${package}_SubMajor} ${${package}_Minor} ${${package}_SubMinor}" )
+
+endmacro( parse_version )