From b4d20b7c10a5e94e4c10f8cce5f8da428cf1c7b6 Mon Sep 17 00:00:00 2001
From: Dilawar Singh <dilawars@ncbs.res.in>
Date: Mon, 24 Apr 2017 09:59:00 +0530
Subject: [PATCH] Squashed 'moose-core/' changes from eb878dd..4f391e1
4f391e1 --std=c++11 is must now. Fixes BhallaLab/moose#214.
718252a Do not copy VERSION file for python. Lets find a better and more portable solution.
f26225d Updated default version in setup.py file.
1476ea1 Merge commit '0ff1b77a6fa7152903e2a3f8e0fbe658fb314e5c'
0da1cc4 VERSION string is fixed to today's date if not given.
git-subtree-dir: moose-core
git-subtree-split: 4f391e1ef906eacb103bb85d723ee98453f06d5b
---
CMakeLists.txt | 7 ++++++-
Makefile | 4 ++--
pymoose/CMakeLists.txt | 2 --
python/setup.py | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 390904c5..7e4a21d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,12 @@ if( (NOT MOOSE_VERSION) AND GIT_EXEC)
file(WRITE ${VERSION_FILE} ${MOOSE_VERSION})
elseif( (NOT MOOSE_VERSION) AND (NOT GIT_EXEC) )
message(STATUS "+ Reading ${VERSION_FILE}" )
- file(READ ${VERSION_FILE} GIT_VERSION_OUTPUT )
+ if(EXISTS ${VERSION_FILE} )
+ file(READ ${VERSION_FILE} MOOSE_VERSION )
+ else()
+ string(TIMESTAMP MOOSE_VERSION "nightly-%Y%m%d" )
+ set(GIT_VERSION_OUTPUT "nightly" )
+ endif( )
elseif(MOOSE_VERSION)
message(STATUS "+ Using user specified VERSION = ${MOOSE_VERSION}" )
file(WRITE ${VERSION_FILE} ${MOOSE_VERSION})
diff --git a/Makefile b/Makefile
index 5dda4598..3df49b3d 100644
--- a/Makefile
+++ b/Makefile
@@ -273,12 +273,12 @@ endif
# Here we automagically change compilers to deal with MPI.
ifdef USE_MPI
- CXX = mpicxx
+ CXX = mpicxx --std=c++11
# CXX = /usr/local/mvapich2/bin/mpicxx
# PARALLEL_DIR = parallel
# PARALLEL_LIB = parallel/parallel.o
else
- CXX = g++
+ CXX = g++ --std=c++11
# CXX = CC # Choose between Solaris CC and g++ on a Solaris machine
endif
diff --git a/pymoose/CMakeLists.txt b/pymoose/CMakeLists.txt
index af4e8e74..cd7de488 100644
--- a/pymoose/CMakeLists.txt
+++ b/pymoose/CMakeLists.txt
@@ -93,8 +93,6 @@ endif(MACOSX)
add_custom_target(copy_python_files ALL
COMMAND ${CMAKE_COMMAND} -E copy_directory
${CMAKE_SOURCE_DIR}/python ${CMAKE_BINARY_DIR}/python
- COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_SOURCE_DIR}/VERSION ${CMAKE_BINARY_DIR}/VERSION
COMMENT "Copying required python files and other files to build directory"
VERBATIM
)
diff --git a/python/setup.py b/python/setup.py
index a6c3852c..475826a5 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -33,7 +33,7 @@ from distutils.core import setup
script_dir = os.path.dirname( os.path.abspath( __file__ ) )
-version = '3.1'
+version = '3.2.git'
try:
with open( os.path.join( script_dir, '..', 'VERSION'), 'r' ) as f:
version = f.read( )
--
GitLab