Skip to content

Commit

Permalink
Refs #5146 comment lines in CMakeList.txt
Browse files Browse the repository at this point in the history
lines commented until HDF5 libraries properly installed
modified:   CMakeLists.txt
  • Loading branch information
jmborr committed May 16, 2012
1 parent 1a95cbe commit 18b7514
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions Code/Mantid/Framework/DataHandling/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ set ( SRC_FILES
src/LoadRawBin0.cpp
src/LoadRawHelper.cpp
src/LoadRawSpectrum0.cpp
src/LoadSassena.cpp
# src/LoadSassena.cpp
src/LoadSNSEventNexus.cpp
src/LoadSNSNexus.cpp
src/LoadSNSspec.cpp
Expand Down Expand Up @@ -186,7 +186,7 @@ set ( INC_FILES
inc/MantidDataHandling/LoadRawBin0.h
inc/MantidDataHandling/LoadRawHelper.h
inc/MantidDataHandling/LoadRawSpectrum0.h
inc/MantidDataHandling/LoadSassena.h
# inc/MantidDataHandling/LoadSassena.h
inc/MantidDataHandling/LoadSNSEventNexus.h
inc/MantidDataHandling/LoadSNSNexus.h
inc/MantidDataHandling/LoadSNSspec.h
Expand Down Expand Up @@ -361,11 +361,13 @@ set_target_properties ( DataHandling PROPERTIES OUTPUT_NAME MantidDataHandling )
# Add to the 'Framework' group in VS
set_property ( TARGET DataHandling PROPERTY FOLDER "MantidFramework" )

find_package ( HDF5 COMPONENTS HL REQUIRED )
#find_package ( HDF5 COMPONENTS HL REQUIRED )

include_directories ( inc ../Nexus/inc ${HDF5_INCLUDE_DIRS})
#include_directories ( inc ../Nexus/inc ${HDF5_INCLUDE_DIRS})
include_directories ( inc ../Nexus/inc)

target_link_libraries ( DataHandling ${MANTIDLIBS} Nexus ${HDF5_LIBRARIES})
#target_link_libraries ( DataHandling ${MANTIDLIBS} Nexus ${HDF5_LIBRARIES})
target_link_libraries ( DataHandling ${MANTIDLIBS} Nexus)

if ( CXXTEST_FOUND )
include_directories ( ../TestHelpers/inc )
Expand Down

0 comments on commit 18b7514

Please sign in to comment.