libraries/mrw-cxx
1
0
Fork 0
Code Issues Releases Activity

correct macro name and make what/ident optional

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-03-03 13:17:36 +00:00
parent beab19319a
commit a729670ba7
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mrw/args.hxx
View File

@@ -27,8 +27,12 @@
*/
// Add version information for @c what and @c ident
const std::string MRW_IDENT("$Id: " PACKAGE_NAME "-" PACKAGEPACKAGE_VERSION " $");
const std::string MRW_WHAT("#(@)" PACKAGE_NAME "-" PACKAGEPACKAGE_VERSION);
#if defined(PACKAGE_NAME) && defined(PACKAGE_VERSION)
const std::string MRW_IDENT("$Id: " PACKAGE_NAME "-" PACKAGE_VERSION " $");
const std::string MRW_WHAT("#(@)" PACKAGE_NAME "-" PACKAGE_VERSION);
#else
# warning pass -DPACKAGE_NAME=name -DPACKAGE_VERSION=version for ident/what
#endif
namespace mrw {
/// Cool and easy evaluation of commandline arguments in C++11.
@@ -340,11 +344,11 @@ namespace mrw {
}
/// @return version information
std::string version_text() {
# ifdef PACKAGEPACKAGE_VERSION
# ifdef PACKAGE_VERSION
# ifdef PACKAGE_NAME
std::string v(": " PACKAGE_NAME "-" PACKAGEPACKAGE_VERSION);
std::string v(": " PACKAGE_NAME "-" PACKAGE_VERSION);
# else
std::string v("-" PACKAGEPACKAGE_VERSION);
std::string v("-" PACKAGE_VERSION);
# endif
# else
# ifdef PACKAGE_NAME

1
src/version.cxx.in
View File

@@ -14,3 +14,4 @@ namespace mrw {
const std::string WHAT("#(@) @PACKAGE_NAME@-@PACKAGE_VERSION@");
const std::string IDENT("$Id: @PACKAGE_NAME@-@PACKAGE_VERSION@ $");
}