diff --git a/doc/conf.py.in b/doc/conf.py.in index 08d29930..01fd4bc2 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -21,7 +21,7 @@ source_suffix = '.rst' project = u'APP4TRIQS - An example triqs application' copyright = u'2017-2018 N. Wentzell, O. Parcollet 2018-2019 The Simons Foundation, authors: N. Wentzell, D. Simons, H. Strand, O. Parcollet' -version = '@APP4TRIQS_VERSION@' +version = '@PROJECT_VERSION@' mathjax_path = "@TRIQS_MATHJAX_PATH@/MathJax.js?config=default" templates_path = ['@PROJECT_SOURCE_DIR@/doc/_templates'] diff --git a/python/app4triqs/version.py.in b/python/app4triqs/version.py.in index d97a682a..f26b5708 100644 --- a/python/app4triqs/version.py.in +++ b/python/app4triqs/version.py.in @@ -21,7 +21,7 @@ # ################################################################################ -version = "@APP4TRIQS_VERSION@" +version = "@PROJECT_VERSION@" triqs_hash = "@TRIQS_GIT_HASH@" app4triqs_hash = "@PROJECT_GIT_HASH@" diff --git a/share/app4triqs.modulefile.in b/share/app4triqs.modulefile.in index cbca2b0b..ee0ffd00 100644 --- a/share/app4triqs.modulefile.in +++ b/share/app4triqs.modulefile.in @@ -1,9 +1,9 @@ #%Module1.0 # -# To be installed as ${MODULEPATH}/app4triqs/@APP4TRIQS_VERSION@ +# To be installed as ${MODULEPATH}/app4triqs/@PROJECT_VERSION@ set name app4triqs -set version @APP4TRIQS_VERSION@ +set version @PROJECT_VERSION@ set root @CMAKE_INSTALL_PREFIX@ set git_hash @PROJECT_GIT_HASH@ diff --git a/share/cmake/app4triqs-config-version.cmake.in b/share/cmake/app4triqs-config-version.cmake.in index 9d1cb5c4..c4c43a4b 100644 --- a/share/cmake/app4triqs-config-version.cmake.in +++ b/share/cmake/app4triqs-config-version.cmake.in @@ -1,4 +1,4 @@ -set(PACKAGE_VERSION @APP4TRIQS_VERSION@) +set(PACKAGE_VERSION @PROJECT_VERSION@) if (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION) set(PACKAGE_VERSION_EXACT TRUE)