Skip to content
Snippets Groups Projects
Commit 67012a1c authored by Dilawar Singh's avatar Dilawar Singh
Browse files

Some updates to fix static hdf5 libraries.

parent 8a717ae6
No related branches found
No related tags found
1 merge request!213Update rmoogli.py
#!/bin/bash #!/bin/bash
set -x
set -e
# NOTICE: This file is parsed by cmake to create a shell script. Not all syntax # 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 # will play well with cmake. CMAKE replaces @FOO@ and ${FOO} with cmake variable
...@@ -18,7 +20,7 @@ echo "Building MOOSE" ...@@ -18,7 +20,7 @@ echo "Building MOOSE"
@CMAKE_PYMOOSE_ARGS@ \ @CMAKE_PYMOOSE_ARGS@ \
@PYMOOSE_SOURCE_DIR@ @PYMOOSE_SOURCE_DIR@
$MAKE $MAKE
ctest -V || echo "Some tests failed" ctest -output-on-failure || echo "Some tests failed"
$MAKE install $MAKE install
) )
...@@ -33,7 +33,7 @@ elseif( (NOT MOOSE_VERSION) AND (NOT GIT_EXEC) ) ...@@ -33,7 +33,7 @@ elseif( (NOT MOOSE_VERSION) AND (NOT GIT_EXEC) )
message(STATUS "+ Reading ${VERSION_FILE}" ) message(STATUS "+ Reading ${VERSION_FILE}" )
file(READ ${VERSION_FILE} GIT_VERSION_OUTPUT ) file(READ ${VERSION_FILE} GIT_VERSION_OUTPUT )
elseif(MOOSE_VERSION) elseif(MOOSE_VERSION)
message(STATUS "+ Using user VERSION ${MOOSE_VERSION}" ) message(STATUS "+ Using user specified VERSION = ${MOOSE_VERSION}" )
file(WRITE ${VERSION_FILE} ${MOOSE_VERSION}) file(WRITE ${VERSION_FILE} ${MOOSE_VERSION})
else() else()
message(FATAL_ERROR "Could not determine MOOSE_VERSION" ) message(FATAL_ERROR "Could not determine MOOSE_VERSION" )
...@@ -127,17 +127,6 @@ if(GPROF AND DEBUG) ...@@ -127,17 +127,6 @@ if(GPROF AND DEBUG)
set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-pg") set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-pg")
endif() 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 #################################### ################################### TARGETS ####################################
add_library(libmoose SHARED basecode/main.cpp) add_library(libmoose SHARED basecode/main.cpp)
...@@ -228,10 +217,10 @@ if(HDF5_FOUND) ...@@ -228,10 +217,10 @@ if(HDF5_FOUND)
find_library(HDF5_HL_LIBRARIES NAMES libhdf5_hl.a find_library(HDF5_HL_LIBRARIES NAMES libhdf5_hl.a
PATHS $ENV{HDF5_ROOT}/lib $ENV{HDF5_ROOT}/lib64 PATHS $ENV{HDF5_ROOT}/lib $ENV{HDF5_ROOT}/lib64
) )
set(HDF5_LIBRARIES ${HDF5_CXX_LIBRARIES} ${HDF5_HL_LIBRARIES})
endif() endif()
set(HDF5_LIBRARIES ${HDF5_CXX_LIBRARIES} ${HDF5_HL_LIBRARIES}) message(STATUS "MOOSE will following HDF5 ${HDF5_LIBRARIES}" )
message(STATUS "MOOSE will use ${HDF5_LIBRARIES}" )
foreach(HDF5_LIB ${HDF5_LIBRARIES}) foreach(HDF5_LIB ${HDF5_LIBRARIES})
if(HDF5_LIB) if(HDF5_LIB)
get_filename_component( HDF5_LIB_EXT ${HDF5_LIB} EXT ) get_filename_component( HDF5_LIB_EXT ${HDF5_LIB} EXT )
...@@ -244,6 +233,8 @@ if(HDF5_FOUND) ...@@ -244,6 +233,8 @@ if(HDF5_FOUND)
endif() endif()
endif( ) endif( )
endforeach( ) endforeach( )
else( HDF5_FOUND )
message(STATUS "HDF5 is not found" )
endif( HDF5_FOUND ) endif( HDF5_FOUND )
# This is a fix for new HDF5 package on Debian/Ubuntu which installs hdf5 # This is a fix for new HDF5 package on Debian/Ubuntu which installs hdf5
......
3.1.1-68-g407f570 3.1.1
\ No newline at end of file \ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment