diff --git a/build_moose-core.sh.in b/build_moose-core.sh.in index a42f723ac694efb14c6811051eaa58b25ffc788b..743243d111bbba21803f6a0d114321a5309d1995 100755 --- a/build_moose-core.sh.in +++ b/build_moose-core.sh.in @@ -1,4 +1,6 @@ #!/bin/bash +set -x +set -e # NOTICE: This file is parsed by cmake to create a shell script. Not all syntax # will play well with cmake. CMAKE replaces @FOO@ and ${FOO} with cmake variable @@ -18,7 +20,7 @@ echo "Building MOOSE" @CMAKE_PYMOOSE_ARGS@ \ @PYMOOSE_SOURCE_DIR@ $MAKE - ctest -V || echo "Some tests failed" + ctest -output-on-failure || echo "Some tests failed" $MAKE install ) diff --git a/moose-core/CMakeLists.txt b/moose-core/CMakeLists.txt index 60acdcd6c3bd4ed1fe72ec2519a9cb2017097aab..9b4caff56d4440095cbbdb072c9ed0f6f2ed0b33 100644 --- a/moose-core/CMakeLists.txt +++ b/moose-core/CMakeLists.txt @@ -33,7 +33,7 @@ elseif( (NOT MOOSE_VERSION) AND (NOT GIT_EXEC) ) message(STATUS "+ Reading ${VERSION_FILE}" ) file(READ ${VERSION_FILE} GIT_VERSION_OUTPUT ) elseif(MOOSE_VERSION) - message(STATUS "+ Using user VERSION ${MOOSE_VERSION}" ) + message(STATUS "+ Using user specified VERSION = ${MOOSE_VERSION}" ) file(WRITE ${VERSION_FILE} ${MOOSE_VERSION}) else() message(FATAL_ERROR "Could not determine MOOSE_VERSION" ) @@ -127,17 +127,6 @@ if(GPROF AND DEBUG) set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-pg") endif() -IF(NOTIFY_PROGRESS) - IF(COMPILER_SUPPORTS_CXX11 OR COMPILER_SUPPORTS_CXX0X) - MESSAGE(STATUS "MOOSE will occasionally write to __moose__progress__ file " - " status of simulation (done time/total time)" - ) - ELSE() - MESSAGE(FATAL_ERROR "No c++11 or c++0x support in compiler." - "You can not use -DNOTIFY_PROGRESS=ON without it" - ) - ENDIF() -ENDIF() ################################### TARGETS #################################### add_library(libmoose SHARED basecode/main.cpp) @@ -228,10 +217,10 @@ if(HDF5_FOUND) find_library(HDF5_HL_LIBRARIES NAMES libhdf5_hl.a PATHS $ENV{HDF5_ROOT}/lib $ENV{HDF5_ROOT}/lib64 ) + set(HDF5_LIBRARIES ${HDF5_CXX_LIBRARIES} ${HDF5_HL_LIBRARIES}) endif() - set(HDF5_LIBRARIES ${HDF5_CXX_LIBRARIES} ${HDF5_HL_LIBRARIES}) - message(STATUS "MOOSE will use ${HDF5_LIBRARIES}" ) + message(STATUS "MOOSE will following HDF5 ${HDF5_LIBRARIES}" ) foreach(HDF5_LIB ${HDF5_LIBRARIES}) if(HDF5_LIB) get_filename_component( HDF5_LIB_EXT ${HDF5_LIB} EXT ) @@ -244,6 +233,8 @@ if(HDF5_FOUND) endif() endif( ) endforeach( ) +else( HDF5_FOUND ) + message(STATUS "HDF5 is not found" ) endif( HDF5_FOUND ) # This is a fix for new HDF5 package on Debian/Ubuntu which installs hdf5 diff --git a/moose-core/VERSION b/moose-core/VERSION index abee1689d0657609e05f20e74cec34912c6fd9e1..50e47c89cafc3ec95774b3110a3dba45256d0b24 100644 --- a/moose-core/VERSION +++ b/moose-core/VERSION @@ -1 +1 @@ -3.1.1-68-g407f570 \ No newline at end of file +3.1.1 \ No newline at end of file