Commit in slic on MAIN | |||
CMakeLists.txt | +11 | 1.1 -> 1.2 | |
include/Geant4VersionInfo.hh.in | +2 | -17 | 1.1 -> 1.2 |
/PackageInfo.hh.in | +29 | -22 | 1.4 -> 1.5 |
+42 | -39 |
chance configured file format to CMake
diff -u -r1.1 -r1.2 --- CMakeLists.txt 10 Apr 2013 23:52:32 -0000 1.1 +++ CMakeLists.txt 11 Apr 2013 18:42:04 -0000 1.2 @@ -50,6 +50,8 @@
MESSAGE( STATUS "Found Geant4: ${Geant4_DIR}" ) ENDIF()
+MESSAGE( STATUS "Geant4_VERSION=${Geant4_VERSION}" ) +
# find GDML FIND_PACKAGE( GDML REQUIRED ) if ( NOT GDML_FOUND )
@@ -74,6 +76,15 @@
MESSAGE( STATUS "Found HEPPDT: ${HEPPDT_DIR}" ) ENDIF()
+ +#EXECUTE_PROCESS( COMMAND grep "define G4VERSION_NUMBER" ${Geant4_DIR}/source/global/management/include/G4Version.hh | sed 's/#define G4VERSION_NUMBER\ \ //g' OUTPUT_VARIABLE GEANT4_VERSION ) +#EXECUTE_PROCESS( COMMAND grep "define G4VERSION_NUMBER" ${Geant4_DIR}/source/global/management/include/G4Version.hh OUTPUT_VARIABLE GEANT4_VERSION ) +#MESSAGE( STATUS "GEANT4_VERSION=${GEANT4_VERSION}" ) + +# configure files +CONFIGURE_FILE( ${PROJECT_SOURCE_DIR}/include/PackageInfo.hh.in ${PROJECT_SOURCE_DIR}/include/PackageInfo.hh) +CONFIGURE_FILE( ${PROJECT_SOURCE_DIR}/include/Geant4VersionInfo.hh.in ${PROJECT_SOURCE_DIR}/include/Geant4VersionInfo.hh ) +
# additional compilation flags ADD_DEFINITIONS( ${Geant4_DEFINITIONS} )
diff -u -r1.1 -r1.2 --- Geant4VersionInfo.hh.in 17 Dec 2007 21:11:59 -0000 1.1 +++ Geant4VersionInfo.hh.in 11 Apr 2013 18:42:04 -0000 1.2 @@ -14,25 +14,10 @@
Geant4VersionInfo() {;} public:
- - static int getMajorVersion() - { - return @GEANT4_MAJOR_VERSION@; - } - - static int getMinorVersion() - { - return @GEANT4_MINOR_VERSION@; - } - - static int getPatchVersion() - { - return @GEANT4_PATCH_VERSION@; - } -
+
static std::string getFullVersion() {
- return "@GEANT4_FULL_VERSION@";
+ return "@Geant4_VERSION@";
} };
diff -u -r1.4 -r1.5 --- PackageInfo.hh.in 5 Sep 2006 23:21:47 -0000 1.4 +++ PackageInfo.hh.in 11 Apr 2013 18:42:04 -0000 1.5 @@ -1,36 +1,38 @@
-// $Header: /cvs/lcd/slic/include/PackageInfo.hh.in,v 1.4 2006/09/05 23:21:47 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/PackageInfo.hh.in,v 1.5 2013/04/11 18:42:04 jeremy Exp $
#ifndef SLIC_PACKAGE_INFO_HH #define SLIC_PACKAGE_INFO_HH 1
-namespace slic -{
+namespace slic {
- class PackageInfo - {
+ class PackageInfo {
- public:
+ public:
- static std::string& getVersionString() - { - static std::string ver_str = "@PACKAGE_VERSION@"; - return ver_str; - }
+ static std::string& getVersionString() { + static std::string ver_str = "@SLIC_VERSION@"; + return ver_str; + } + + static std::string& getNameString() { + static std::string name_str = "Simulation for the Linear Collider"; + return name_str; + } + + static std::string& getAbbrevString() { + static std::string abbrev_str = "slic"; + return abbrev_str; + }
+/*
static std::string& getAuthorString() { static std::string auth_str = "@PACKAGE_AUTHORS@"; return auth_str; }
- static std::string& getNameString() - { - static std::string name_str = "@PACKAGE_FULLNAME@"; - return name_str; - } -
static std::string& getAbbrevString() {
- static std::string abbrev_str = "@PACKAGE_NAME@";
+ static std::string abbrev_str = "@PROJECT@";
return abbrev_str; }
@@ -58,10 +60,8 @@
return email_str; }
- static std::string getFullApplicationString() - { - static std::string fullVerStr = - getNameString() + "; "
+ static std::string getFullApplicationString() { + static std::string fullVerStr = getNameString() + "; "
+ getAbbrevString() + "; " + getVersionString() + "; " + getAuthorString() + "; "
@@ -69,6 +69,13 @@
+ getChangeDateString(); return fullVerStr; }
+ */ + + static std::string getFullApplicationString() { + static std::string fullVerStr = getNameString() + "; " + getVersionString(); + return fullVerStr; + } +
}; }
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1