Skip to content

Commit

Permalink
Use @ substitution as works better with cmake
Browse files Browse the repository at this point in the history
  • Loading branch information
mcraig-ibme committed Jun 6, 2017
1 parent 2f28f78 commit a4698cf
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ execute_process(COMMAND
OUTPUT_VARIABLE GIT_DATE
ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)

configure_file(verbena.in verbena)
configure_file(verbena.in verbena @ONLY)
INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/verbena DESTINATION bin)

2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ all: ${SCRIPTS}
.PHONY: FORCE

$(SCRIPTS): %: %.in FORCE
sed -e "s/\$${GIT_SHA1}/${GIT_SHA1}/" -e "s/\$${GIT_DATE}/${GIT_DATE}/" $< >$@
sed -e "s/@GIT_SHA1@/${GIT_SHA1}/" -e "s/@GIT_DATE@/${GIT_DATE}/" $< >$@

clean:
rm ${SCRIPTS}
Expand Down
4 changes: 2 additions & 2 deletions verbena.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
# to be used, possibly with bundled dependencies
PATH=`dirname $0`:${FSLDIR}/bin:${PATH}

echo "VERBENA version tag '${GIT_SHA1}'"
echo "last commit '${GIT_DATE}'"
echo "VERBENA version tag '@GIT_SHA1@'"
echo "last commit '@GIT_DATE@'"
echo

Usage() {
Expand Down

0 comments on commit a4698cf

Please sign in to comment.