LCPQ/dft_tools
3
0
Fork 0
mirror of https://github.com/triqs/dft_tools synced 2024-12-21 11:53:41 +01:00
Code Issues Releases Wiki Activity

[cmake] Dft_tools version detection via git

Browse Source
This commit is contained in:
Nils Wentzell 2018-06-01 09:24:39 -04:00
parent dfb185477a
commit 8a4f23e340
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -1,7 +1,3 @@
# Version number of the application
set (DFT_TOOLS_VERSION "1.5")
set (DFT_TOOLS_RELEASE "1.5.0")
# Default to Release build type # Default to Release build type
if(NOT CMAKE_BUILD_TYPE) if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release CACHE STRING "Type of build" FORCE) set(CMAKE_BUILD_TYPE Release CACHE STRING "Type of build" FORCE)
@ -30,8 +26,17 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR (NOT IS_ABSOLUTE ${CMAKE_INSTA
endif() endif()
message(STATUS "-------- CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX} -------------") message(STATUS "-------- CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX} -------------")
# Macro defined in TRIQS which picks the hash of repo. # Use git to detect Cthyb version and git hash
execute_process(COMMAND bash "-c" "${TRIQS_GIT_EXECUTABLE} describe | sed \"s/-\\([0-9]*\\)-.*/.\\1/g\""
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
OUTPUT_VARIABLE DFT_TOOLS_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if(NOT DFT_TOOLS_VERSION)
set(DFT_TOOLS_VERSION 1.5)
endif()
triqs_get_git_hash_of_source_dir(DFT_TOOLS_GIT_HASH) triqs_get_git_hash_of_source_dir(DFT_TOOLS_GIT_HASH)
MESSAGE(STATUS "Dft_tools version : ${DFT_TOOLS_VERSION}")
message(STATUS "Git hash: ${DFT_TOOLS_GIT_HASH}") message(STATUS "Git hash: ${DFT_TOOLS_GIT_HASH}")
add_subdirectory(fortran/dmftproj) add_subdirectory(fortran/dmftproj)

1
doc/conf.py.in
View File

@ -20,7 +20,6 @@ source_suffix = '.rst'
project = u'TRIQS DFTTools' project = u'TRIQS DFTTools'
copyright = u'2011-2013, M. Aichhorn, L. Pourovskii, V. Vildosola, C. Martins' copyright = u'2011-2013, M. Aichhorn, L. Pourovskii, V. Vildosola, C. Martins'
version = '@DFT_TOOLS_VERSION@' version = '@DFT_TOOLS_VERSION@'
release = '@DFT_TOOLS_RELEASE@'
mathjax_path = "@TRIQS_MATHJAX_PATH@/MathJax.js?config=default" mathjax_path = "@TRIQS_MATHJAX_PATH@/MathJax.js?config=default"
templates_path = ['@CMAKE_SOURCE_DIR@/doc/_templates'] templates_path = ['@CMAKE_SOURCE_DIR@/doc/_templates']