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 '0ff1b77a'
0da1cc4 VERSION string is fixed to today's date if not given.

git-subtree-dir: moose-core
git-subtree-split: 4f391e1ef906eacb103bb85d723ee98453f06d5b

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})

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
 

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
     )

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( )