Skip to content

Commit da0db90

Browse files
author
Dilawar Singh
committed
Changed MOOSE_VERSION to __VERSION__ since new cmake 3.7.1 sets it to
empty. See cmake policy CMP0048.
1 parent b8a8b6d commit da0db90

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

CMakeLists.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,27 @@ include(FindPkgConfig)
2020
set(VERSION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/VERSION)
2121
find_program(GIT_EXEC "git")
2222
message( STATUS "Looking for git ${GIT_EXEC}" )
23-
if( (NOT MOOSE_VERSION) AND GIT_EXEC)
23+
if( (NOT __VERSION__) AND GIT_EXEC)
2424
execute_process(
2525
COMMAND ${GIT_EXEC} describe --tags --long
2626
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
27-
OUTPUT_VARIABLE MOOSE_VERSION
27+
OUTPUT_VARIABLE __VERSION__
2828
OUTPUT_STRIP_TRAILING_WHITESPACE
2929
)
30-
message(STATUS "+ Writing ${MOOSE_VERSION} to ${VERSION_FILE}" )
31-
file(WRITE ${VERSION_FILE} ${MOOSE_VERSION})
32-
elseif( (NOT MOOSE_VERSION) AND (NOT GIT_EXEC) )
30+
message(STATUS "+ Writing ${__VERSION__} to ${VERSION_FILE}" )
31+
file(WRITE ${VERSION_FILE} ${__VERSION__})
32+
elseif( (NOT __VERSION__) AND (NOT GIT_EXEC) )
3333
message(STATUS "+ Reading ${VERSION_FILE}" )
3434
file(READ ${VERSION_FILE} GIT_VERSION_OUTPUT )
35-
elseif(MOOSE_VERSION)
36-
message(STATUS "+ Using user specified VERSION = ${MOOSE_VERSION}" )
37-
file(WRITE ${VERSION_FILE} ${MOOSE_VERSION})
35+
elseif(__VERSION__)
36+
message(STATUS "+ Using user specified VERSION = ${__VERSION__}" )
37+
file(WRITE ${VERSION_FILE} ${__VERSION__})
3838
else()
39-
message(FATAL_ERROR "Could not determine MOOSE_VERSION" )
39+
message(FATAL_ERROR "Could not determine __VERSION__" )
4040
endif( )
4141

42-
add_definitions( -DMOOSE_VERSION="${MOOSE_VERSION}")
43-
message( STATUS "MOOSE Version ${MOOSE_VERSION}" )
42+
add_definitions( -D__VERSION__="${__VERSION__}")
43+
message( STATUS "MOOSE Version ${__VERSION__}" )
4444

4545
# This snippet is from LLVM project.
4646
# Sanity check our source directory to make sure that we are not trying to

0 commit comments

Comments
 (0)