Merge pull request #429 from mantidproject/11388_find_hdf5_headers_in_exotic_places

Find HDF5 headers in exotic locations

Code/Mantid/Build/CMake/CommonSetup.cmake

@@ -72,7 +72,7 @@ set ( CMAKE_INCLUDE_PATH ${CMAKE_INCLUDE_PATH}/zlib123 )
 find_package ( ZLIB REQUIRED )
 set ( CMAKE_INCLUDE_PATH ${MAIN_CMAKE_INCLUDE_PATH} )
 
-if (${CMAKE_SYSTEM_NAME} MATCHES "Windows" OR OSX_VERSION VERSION_LESS 10.9)
+if (${CMAKE_SYSTEM_NAME} MATCHES "Windows" OR (APPLE AND OSX_VERSION VERSION_LESS 10.9))
   set (HDF5_DIR "${CMAKE_MODULE_PATH}")
   find_package ( HDF5 COMPONENTS HL REQUIRED
     CONFIGS hdf5-config.cmake )