diff --git a/CMakeLists.txt b/CMakeLists.txt index 746f32e5b92ac56d2bcbbf358088f35ed0ea917a..4f52fe0c47529d7aeb29b87a7b97809247599312 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 269e28e5658347987d455beb4cc070a5cb64ff17..084f8f91c527bb3edd0494cdccfc86048bb2147d 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 8737681d2a56b3d7eb57a3537f985075dda561b5..84c80e4722426f96871d16fc20f683bfa95b3941 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}" )