Skip to content

Commit

Permalink
Refs #6201. Fixing linking.
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael Reuter authored and peterfpeterson committed Jan 30, 2013
1 parent 8315a2a commit 0862fea
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Code/Mantid/Framework/DataHandling/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ ENDIF()
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 ${NEXUS_LIBRARIES} ${HDF5_LIBRARIES})
#target_link_libraries ( DataHandling ${MANTIDLIBS} Nexus)

# Add the unit tests directory
Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/Framework/Kernel/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ set_target_properties ( Kernel PROPERTIES OUTPUT_NAME MantidKernel
# Add to the 'Framework' group in VS
set_property ( TARGET Kernel PROPERTY FOLDER "MantidFramework" )

target_link_libraries ( Kernel ${MANTIDLIBS} ${GSL_LIBRARIES} )
target_link_libraries ( Kernel ${MANTIDLIBS} ${GSL_LIBRARIES} ${NEXUS_LIBRARIES} )
if ( WIN32 )
target_link_libraries ( Kernel Psapi.lib ) # For memory usage queries
endif()
Expand Down

0 comments on commit 0862fea

Please sign in to comment.