Merge pull request #16831 from mantidproject/cmake36

Fix build errors with CMake 3.6 on OS X.

Framework/DataHandling/CMakeLists.txt

@@ -532,7 +532,7 @@ set_property ( TARGET DataHandling PROPERTY FOLDER "MantidFramework" )
 target_include_directories ( DataHandling PUBLIC inc ../Nexus/inc)
 target_include_directories ( DataHandling SYSTEM PRIVATE ${HDF5_INCLUDE_DIRS})
 
-target_link_libraries ( DataHandling LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME} ${MANTIDLIBS} Nexus ${NEXUS_LIBRARIES} ${HDF5_LIBRARIES} ${JSONCPP_LIBRARIES} )
+target_link_libraries ( DataHandling LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME} ${MANTIDLIBS} Nexus ${NEXUS_LIBRARIES} ${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES} ${JSONCPP_LIBRARIES} )
 
 # Add the unit tests directory
 add_subdirectory ( test )

Framework/DataHandling/test/CMakeLists.txt

@@ -26,7 +26,8 @@ if ( CXXTEST_FOUND )
             ${NEXUS_LIBRARIES}
             ${Boost_LIBRARIES}
             ${POCO_LIBRARIES}
-            ${HDF5_LIBRARIES} )
+            ${HDF5_LIBRARIES}
+            ${HDF5_HL_LIBRARIES} )
   add_dependencies ( DataHandlingTest Algorithms MDAlgorithms )
   add_dependencies ( FrameworkTests DataHandlingTest )
   # Test data

buildconfig/CMake/DarwinSetup.cmake

@@ -121,6 +121,10 @@ if (NOT OPENSSL_ROOT_DIR)
   set ( OPENSSL_ROOT_DIR /usr/local/opt/openssl )
 endif(NOT OPENSSL_ROOT_DIR)
 
+if (NOT HDF5_ROOT)
+  set ( HDF5_ROOT /usr/local/opt/hdf5 )
+endif()
+
 # Python packages
 
 install ( PROGRAMS ${SITEPACKAGES}/sip.so DESTINATION ${BIN_DIR} )