Skip to content

fix: stop version.h dropping zero-valued version components #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
skilledwolf wants to merge 1 commit into from
Closed

fix: stop version.h dropping zero-valued version components #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 26 additions & 14 deletions src/alps/version.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,34 +30,46 @@
#ifndef ALPS_VERSION_H
#define ALPS_VERSION_H

// Plain #define for everything the build always sets: the cmakedefine directive
// emits an "undef" when its value is false-y, and CMake counts 0 as false-y, so
// a zero component (2.4.0) would vanish. It is used below only where the macro
// is genuinely optional. (configure_file matches that directive even inside a
// comment, hence no leading '#' on it here.)

// ALPS version
#cmakedefine ALPS_VERSION "@ALPS_VERSION@"
#define ALPS_VERSION "@ALPS_VERSION@"

#define ALPS_VERSION_MAJOR @ALPS_VERSION_MAJOR@
#define ALPS_VERSION_MINOR @ALPS_VERSION_MINOR@
#define ALPS_VERSION_PATCH @ALPS_VERSION_PATCH@

#cmakedefine ALPS_VERSION_MAJOR @ALPS_VERSION_MAJOR@
#cmakedefine ALPS_VERSION_MINOR @ALPS_VERSION_MINOR@
#cmakedefine ALPS_VERSION_PATCH @ALPS_VERSION_PATCH@
#cmakedefine ALPS_SVN_REVISION @ALPS_WC_REVISION@
// ALPS version as a single integer, for preprocessor comparisons:
// #if ALPS_VERSION_NUMBER >= ALPS_VERSION_NUM(2, 3, 4)
#define ALPS_VERSION_NUM(major, minor, patch) \
((major) * 100000 + (minor) * 100 + (patch))
#define ALPS_VERSION_NUMBER \
ALPS_VERSION_NUM(ALPS_VERSION_MAJOR, ALPS_VERSION_MINOR, ALPS_VERSION_PATCH)

// ALPS version (full string)
#cmakedefine ALPS_VERSION_STRING "@ALPS_VERSION_STRING@"
#define ALPS_VERSION_STRING "@ALPS_VERSION_STRING@"

// latest publish year of ALPS
#cmakedefine ALPS_YEAR "@ALPS_YEAR@"
#define ALPS_YEAR "@ALPS_YEAR@"

// install path of ALPS
#cmakedefine ALPS_PREFIX "@ALPS_PREFIX@"

// source directory of ALPS
#cmakedefine ALPS_SRCDIR "@ALPS_SRCDIR@"
#define ALPS_PREFIX "@ALPS_PREFIX@"

// XSLT PATH
#cmakedefine ALPS_XML_DIR "@ALPS_XML_DIR@"
#define ALPS_XML_DIR "@ALPS_XML_DIR@"

// Optional Windows fallback for the 32/64-bit "Program Files" split. Never set
// by the build, and guarded by #ifdef in parser/xslt_path.C.
#cmakedefine ALPS_XML_ALTERNATE_DIR "@ALPS_XML_ALTERNATE_DIR@"

// hostname where configure script was executed
#cmakedefine ALPS_CONFIG_HOST "@ALPS_CONFIG_HOST@"
#define ALPS_CONFIG_HOST "@ALPS_CONFIG_HOST@"

// username who executed configure script
#cmakedefine ALPS_CONFIG_USER "@ALPS_CONFIG_USER@"
#define ALPS_CONFIG_USER "@ALPS_CONFIG_USER@"

#endif // ALPS_VERSION_H
1 change: 0 additions & 1 deletion tool/pconfig.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
int main() {
std::cout << "ALPS version: " << alps::version() << std::endl
<< "Boost version: " << BOOST_LIB_VERSION << std::endl
<< "source directory: " << ALPS_SRCDIR << std::endl
<< "installed at: " << ALPS_PREFIX << std::endl
<< "configured on: " << alps::config_host() << std::endl
<< "configured by: " << alps::config_user() << std::endl
Expand Down
Loading