Skip to content
GitLab
Commit c0095cdc authored by Lynn Garren's avatar Lynn Garren
Browse files

make sure the defs.h files match

parent ebcaae97
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
View file @ c0095cdc
......@@ -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)
......
Cast/Cast/cmake-defs.h.in
View file @ c0095cdc
/* @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
Evaluator/Evaluator/cmake-defs.h.in
View file @ c0095cdc
/* @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
Exceptions/Exceptions/cmake-defs.h.in
View file @ c0095cdc
/* @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
GenericFunctions/GenericFunctions/CMakeLists.txt
View file @ c0095cdc
......@@ -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
......
GenericFunctions/GenericFunctions/cmake-defs.h.in
View file @ c0095cdc
/* @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
GenericFunctions/src/CMakeLists.txt
View file @ c0095cdc
......@@ -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 )
Geometry/Geometry/cmake-defs.h.in
View file @ c0095cdc
/* @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
Matrix/Matrix/cmake-defs.h.in
View file @ c0095cdc
/* @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
Random/Random/cmake-defs.h.in
View file @ c0095cdc
/* @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
RandomObjects/RandomObjects/cmake-defs.h.in
View file @ c0095cdc
/* @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
RefCount/RefCount/cmake-defs.h.in
View file @ c0095cdc
/* @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
Units/Units/cmake-defs.h.in
View file @ c0095cdc
/* @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
Utility/Utility/cmake-defs.h.in
View file @ c0095cdc
/* @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
Vector/Vector/cmake-defs.h.in
View file @ c0095cdc
/* @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
build-header.in
View file @ c0095cdc
......@@ -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
cmake/Modules/ParseVersion.cmake 0 → 100644
View file @ c0095cdc
# 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 )
Supports Markdown
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