From 168cec89d8d0f81e7b86569c392e53b14a7d055d Mon Sep 17 00:00:00 2001
From: Dilawar Singh <dilawars@ncbs.res.in>
Date: Wed, 28 Feb 2018 13:54:12 +0530
Subject: [PATCH] Test on travis.
---
CMakeLists.txt | 1 -
cmake/build_moose-core.sh.in | 2 +-
moose-core/CMakeLists.txt | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 746f32e5..4f52fe0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,4 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-PROJECT(MOOSE)
project(moose)
diff --git a/cmake/build_moose-core.sh.in b/cmake/build_moose-core.sh.in
index 269e28e5..084f8f91 100755
--- a/cmake/build_moose-core.sh.in
+++ b/cmake/build_moose-core.sh.in
@@ -20,7 +20,7 @@ echo "Building MOOSE"
-DCMAKE_BUILD_TYPE=Release \
-DWITH_BOOST=@WITH_BOOST@ \
-DPYTHON_EXECUTABLE=@PYTHON_EXECUTABLE@ \
- -DMOOSE_VERSION=@_MOOSE_VERSION_@ \
+ -DVERSION_MOOSE=@MOOSE_VERSION@ \
@CMAKE_PYMOOSE_ARGS@ \
@PYMOOSE_SOURCE_DIR@
$MAKE
diff --git a/moose-core/CMakeLists.txt b/moose-core/CMakeLists.txt
index 8737681d..84c80e47 100644
--- a/moose-core/CMakeLists.txt
+++ b/moose-core/CMakeLists.txt
@@ -29,7 +29,7 @@ endif()
# 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.
if(NOT VERSION_MOOSE)
- set(VERSION_MOOSE "3.2.0rc1-${GIT_HEAD}")
+ set(VERSION_MOOSE "3.2.0-${GIT_HEAD}")
endif( )
add_definitions( -DMOOSE_VERSION="${VERSION_MOOSE}")
message( STATUS "MOOSE Version ${VERSION_MOOSE}" )
--
GitLab