From 8afb4db98d79680aff8eb9e67d881c3e90d4be26 Mon Sep 17 00:00:00 2001
From: Dilawar Singh <dilawars@ncbs.res.in>
Date: Sun, 2 Jul 2017 13:57:55 +0530
Subject: [PATCH] Handling MOOSE_VERSION is better way.
---
CMakeLists.txt | 4 ++--
cmake/build_moose-core.sh.in | 1 +
moose-core/CMakeLists.txt | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f073f747..7041adaf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
-
PROJECT(MOOSE)
-set(MOOSE_VERSION "3.1.1")
+
+set(_MOOSE_VERSION_ "3.2" )
# Options to pass down to moose-core
option(WITH_DOC "Build documentation" OFF)
diff --git a/cmake/build_moose-core.sh.in b/cmake/build_moose-core.sh.in
index 8216ad73..43d2ab2b 100755
--- a/cmake/build_moose-core.sh.in
+++ b/cmake/build_moose-core.sh.in
@@ -19,6 +19,7 @@ echo "Building MOOSE"
-DCMAKE_BUILD_TYPE=Release \
-DWITH_BOOST=@WITH_BOOST@ \
-DPYTHON_EXECUTABLE=@PYTHON_EXECUTABLE@ \
+ -DMOOSE_VERSION=@_MOOSE_VERSION_@ \
@CMAKE_PYMOOSE_ARGS@ \
@PYMOOSE_SOURCE_DIR@
$MAKE
diff --git a/moose-core/CMakeLists.txt b/moose-core/CMakeLists.txt
index fa8df758..7c4b3226 100644
--- a/moose-core/CMakeLists.txt
+++ b/moose-core/CMakeLists.txt
@@ -1,6 +1,7 @@
set(CMAKE_LEGACY_CYGWIN_WIN32 0)
cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-project(MOOSE)
+
+project(pymoose)
if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
--
GitLab