From efc1324a17375675b6c0a23113c4248e76aa579b Mon Sep 17 00:00:00 2001
From: Dilawar Singh <dilawar.s.rajput@gmail.com>
Date: Sat, 25 Mar 2017 12:31:48 +0530
Subject: [PATCH] Squashed 'moose-core/' changes from 74b43c3..815a79a
815a79a Fixed the VERSION file creation.
git-subtree-dir: moose-core
git-subtree-split: 815a79a9db1bbae73636a61ff77c5f347cb2255d
---
CMakeLists.txt | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c91065a..7c8fb670 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,22 +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
)
-elseif(_MOOSE_VERSION)
- message(STATUS "+ Using user specified VERSION = ${_MOOSE_VERSION}" )
- file(WRITE ${VERSION_FILE} ${_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" )
+ 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
--
GitLab