Skip to content

Commit

Permalink
Merge pull request #429 from mantidproject/11388_find_hdf5_headers_in…
Browse files Browse the repository at this point in the history
…_exotic_places

Find HDF5 headers in exotic locations
  • Loading branch information
martyngigg committed Mar 20, 2015
2 parents 38f3b34 + 69635b4 commit 363d25b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Code/Mantid/Build/CMake/CommonSetup.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down

0 comments on commit 363d25b

Please sign in to comment.