Skip to content
Snippets Groups Projects
Commit 36ca236d authored by Dilawar Singh's avatar Dilawar Singh
Browse files

Squashed 'moose-core/' changes from b8a8b6d..74b43c3

74b43c3 Enabled travis emails to developers for this release branch.
76bf854 Related to #169 Dropped the support for VERSION file. 1) It would cause lot of merge issues if VERSION file is left in source tree.
00ea9d3 Close #169. Renamed MOOSE_VERSION to _MOOSE_VERSION.
da0db90 Changed MOOSE_VERSION to __VERSION__ since new cmake 3.7.1 sets it to empty. See cmake policy CMP0048.

git-subtree-dir: moose-core
git-subtree-split: 74b43c3ef60a5e834064073fa9dbcfc58cb45d86
parent 41be11d5
No related branches found
No related tags found
No related merge requests found
......@@ -11,6 +11,9 @@ notifications:
email:
recipients:
- dilawar.s.rajput@gmail.com
- bhalla@ncbs.res.in
- hrani@ncbs.res.in
- ray.subhasis@gmail.com
on_success: change
on_failure: always
......
......@@ -20,27 +20,22 @@ include(FindPkgConfig)
set(VERSION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/VERSION)
find_program(GIT_EXEC "git")
message( STATUS "Looking for git ${GIT_EXEC}" )
if( (NOT MOOSE_VERSION) AND GIT_EXEC)
if( (NOT _MOOSE_VERSION) AND GIT_EXEC)
execute_process(
COMMAND ${GIT_EXEC} describe --tags --long
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE MOOSE_VERSION
OUTPUT_VARIABLE _MOOSE_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
message(STATUS "+ Writing ${MOOSE_VERSION} to ${VERSION_FILE}" )
file(WRITE ${VERSION_FILE} ${MOOSE_VERSION})
elseif( (NOT MOOSE_VERSION) AND (NOT GIT_EXEC) )
message(STATUS "+ Reading ${VERSION_FILE}" )
file(READ ${VERSION_FILE} GIT_VERSION_OUTPUT )
elseif(MOOSE_VERSION)
message(STATUS "+ Using user specified VERSION = ${MOOSE_VERSION}" )
file(WRITE ${VERSION_FILE} ${MOOSE_VERSION})
else()
message(FATAL_ERROR "Could not determine MOOSE_VERSION" )
elseif(_MOOSE_VERSION)
message(STATUS "+ Using user specified VERSION = ${_MOOSE_VERSION}" )
file(WRITE ${VERSION_FILE} ${_MOOSE_VERSION})
else( )
message(FATAL_ERROR "Could not determine _MOOSE_VERSION" )
endif( )
add_definitions( -DMOOSE_VERSION="${MOOSE_VERSION}")
message( STATUS "MOOSE Version ${MOOSE_VERSION}" )
add_definitions( -DMOOSE_VERSION="${_MOOSE_VERSION}")
message( STATUS "MOOSE Version ${_MOOSE_VERSION}" )
# This snippet is from LLVM project.
# Sanity check our source directory to make sure that we are not trying to
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment