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

Fixes to extension bug.

parent 7a560392
No related branches found
No related tags found
No related merge requests found
...@@ -218,12 +218,16 @@ endif(NOT HDF5_FOUND) ...@@ -218,12 +218,16 @@ endif(NOT HDF5_FOUND)
if(HDF5_FOUND) if(HDF5_FOUND)
add_definitions( -DUSE_HDF5 ) add_definitions( -DUSE_HDF5 )
include_directories( ${HDF5_INCLUDE_DIRS} ) include_directories( ${HDF5_INCLUDE_DIRS} )
foreach(HDF5_LIB ${HDF5_LIBRARIES}) foreach(HDF5_LIB ${HDF5_CXX_LIBRARIES} ${HDF5_HL_LIBRARIES} )
get_filename_component( HDF5_LIB_EXT ${HDF5_LIB} EXT ) if(HDF5_LIB)
if( ${HDF5_LIB_EXT} STREQUAL ".a" ) get_filename_component( HDF5_LIB_EXT ${HDF5_LIB} EXT )
list(APPEND STATIC_LIBRARIES ${HDF5_LIB} ) if(HDF5_LIB_EXT)
else( ) if(${HDF5_LIB_EXT} STREQUAL ".a")
list(APPEND SYSTEM_SHARED_LIBS ${HDF5_LIB} ) list(APPEND STATIC_LIBRARIES ${HDF5_LIB} )
else( )
list(APPEND SYSTEM_SHARED_LIBS ${HDF5_LIB} )
endif( )
endif()
endif( ) endif( )
endforeach( ) endforeach( )
endif( HDF5_FOUND ) endif( HDF5_FOUND )
...@@ -274,11 +278,15 @@ if(WITH_GSL) ...@@ -274,11 +278,15 @@ if(WITH_GSL)
message(STATUS "Using STATIC gsl libraries: ${GSL_LIBRARIES}") message(STATUS "Using STATIC gsl libraries: ${GSL_LIBRARIES}")
foreach(GSL_LIB ${GSL_LIBRARIES} ) foreach(GSL_LIB ${GSL_LIBRARIES} )
get_filename_component( GSL_LIB_EXT ${GSL_LIB} EXT ) if(GSL_LIB)
if( GSL_LIB_EXT STREQUAL ".a" ) get_filename_component( GSL_LIB_EXT ${GSL_LIB} EXT )
list(APPEND STATIC_LIBRARIES ${GSL_LIB}) if(GSL_LIB_EXT)
else() if(GSL_LIB_EXT STREQUAL ".a" )
list(APPEND SYSTEM_SHARED_LIBS ${GSL_LIB}) list(APPEND STATIC_LIBRARIES ${GSL_LIB})
else()
list(APPEND SYSTEM_SHARED_LIBS ${GSL_LIB})
endif( )
endif( )
endif( ) endif( )
endforeach( ) endforeach( )
endif() endif()
......
3.1.1-40-g8fe5068 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