scnc
/
qmcpack
mirror of https://github.com/QMCPACK/qmcpack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #643 from markdewing/gitrev_fix 

Skip git-rev files for non-git builds.
This commit is contained in:
Graham Lopez 2018-01-19 15:31:00 -05:00 committed by GitHub
parent c426e64999 66b4dd153f
commit d59a2b3f07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -257,9 +257,8 @@ SET(QMCPACK_UNIT_TEST_DIR ${qmcpack_BINARY_DIR}/tests/bin)
######################################################
FIND_PACKAGE(Git)
SET(IS_GIT_PROJECT false)
IF (EXISTS "${PROJECT_SOURCE_DIR}/.git")
SET(IS_GIT_PROJECT true)
IF (GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
SET(IS_GIT_PROJECT 1)
ENDIF()

14
src/CMakeLists.txt
View File

@ -30,7 +30,7 @@ EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E remove ${GITREV_TMP}
)
IF (GIT_FOUND AND IS_GIT_PROJECT)
IF (IS_GIT_PROJECT)
# The following custom command picks up changes to the git revision information
# every time the project is rebuilt. Even if the repositiory is updated (git pull)
# without re-running cmake. It also appends '-dirty' to the commit hash if there are
@ -93,14 +93,6 @@ IF (GIT_FOUND AND IS_GIT_PROJECT)
)
MESSAGE("Git branch: ${GIT_CONFIG_BRANCH}")
MESSAGE("Git commit hash: ${GIT_CONFIG_COMMIT_HASH}")
ELSE()
# Output a blank git version file
EXECUTE_PROCESS(
COMMAND ${CMAKE_COMMAND} -E remove ${GITREV_FILE}
COMMAND ${CMAKE_COMMAND} -E touch ${GITREV_FILE}
COMMAND ${CMAKE_COMMAND} -E remove ${GITREV_TMP}
COMMAND ${CMAKE_COMMAND} -E touch ${GITREV_TMP}
)
ENDIF()
@ -148,8 +140,10 @@ ENDIF(HAVE_OOMPI)
spline2/einspline_allocator.c
spline2/bspline_allocator.cpp
spline2/MultiBspline.cpp
${GITREV_TMP}
)
IF (IS_GIT_PROJECT)
SET(UTILITIES "${UTILITIES};${GITREV_TMP}")
ENDIF()
IF(QMC_ADIOS)
SET(UTILITIES ${UTILITIES}

3
src/config.h.cmake.in
View File

@ -23,6 +23,9 @@
/* define the git last commit date */
// #cmakedefine QMCPLUSPLUS_LAST_CHANGED_DATE "@QMCPLUSPLUS_LAST_CHANGED_DATE@"
/* building from Git repository or not */
#cmakedefine IS_GIT_PROJECT @IS_GIT_PROJECT@
/* define QMC_BUILD_LEVEL */
#cmakedefine QMC_BUILD_LEVEL @QMC_BUILD_LEVEL@

2
src/qmcpack_version.h
View File

@ -8,7 +8,9 @@
#define STR_EXPAND(x) #x
#define STR(x) STR_EXPAND(x)
#ifdef IS_GIT_PROJECT
#include "git-rev.h"
#endif
#ifdef GIT_BRANCH_RAW
#define QMCPACK_GIT_BRANCH STR(GIT_BRANCH_RAW)