From 2b8d61d35a76d713a8abdd3ddc7caefc54e96bb4 Mon Sep 17 00:00:00 2001
From: Dilawar Singh <dilawars@ncbs.res.in>
Date: Mon, 24 Apr 2017 09:54:12 +0530
Subject: [PATCH] Fixed revision issue.
Conflicts:
moose-core/CMakeLists.txt
---
moose-core/CMakeLists.txt | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/moose-core/CMakeLists.txt b/moose-core/CMakeLists.txt
index a9f04454..4f3667a5 100644
--- a/moose-core/CMakeLists.txt
+++ b/moose-core/CMakeLists.txt
@@ -11,9 +11,11 @@ endif(COMMAND cmake_policy)
project(MOOSE)
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")
include(CheckCXXCompiler.cmake)
include(CheckIncludeFileCXX)
include(FindPkgConfig)
+include(GetRevision)
# If from command line, version info is not passed, use the git to generate a
# version file. If GIT fails, use the previous known version.
@@ -27,16 +29,18 @@ if( (NOT MOOSE_VERSION) AND GIT_EXEC)
OUTPUT_VARIABLE MOOSE_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
- message(STATUS "+ Writing ${MOOSE_VERSION} to ${VERSION_FILE}" )
-elseif( (NOT MOOSE_VERSION) AND (NOT GIT_EXEC) )
- message(STATUS "+ Reading ${VERSION_FILE}" )
- string(TIMESTAMP MOOSE_VERSION "nightly-%Y%m%d" )
- set(GIT_VERSION_OUTPUT "nightly" )
+endif( )
+
+# Default to current date.
+if( (NOT MOOSE_VERSION) )
+ NOW(TIMESTAMP)
+ set(MOOSE_VERSION "nightly-${TIMESTAMP}" )
elseif(MOOSE_VERSION)
message(STATUS "+ Using user specified VERSION = ${MOOSE_VERSION}" )
else()
message(FATAL_ERROR "Could not determine MOOSE_VERSION" )
endif( )
+
add_definitions( -DMOOSE_VERSION="${MOOSE_VERSION}")
message( STATUS "MOOSE Version ${MOOSE_VERSION}" )
@@ -99,9 +103,6 @@ option(WITH_MPI "Enable Openmpi support" OFF)
option(WITH_BOOST "Use boost library instead of GSL" OFF)
option(WITH_GSL "Use gsl-library. Alternative is WITH_BOOST" ON)
-################################# CMKAE MACROS #################################
-
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")
############################ BUILD CONFIGURATION #################################
--
GitLab