Code indexing in gitaly is broken and leads to code not being visible to the user. We work on the issue with highest priority.

Skip to content
Snippets Groups Projects
Commit d970f1d8 authored by gsell's avatar gsell
Browse files

Merge branch 'cherry-pick-dbadaeee' into 'master'

Merge branch '677-linking-issues-on-macos' into 'OPAL-2021.1'

See merge request !538
parents dcf95815 f6fadd4f
No related branches found
No related tags found
1 merge request!538Merge branch '677-linking-issues-on-macos' into 'OPAL-2021.1'
......@@ -144,7 +144,9 @@ if (USE_STATIC_LIBRARIES)
endif ()
set (HDF5_PREFER_PARALLEL ON)
find_package (HDF5 REQUIRED)
set (HDF5_LIBRARIES ${HDF5_LIBRARIES} ${CMAKE_DL_LIBS} rt z)
if(UNIX AND NOT APPLE)
set (HDF5_LIBRARIES ${HDF5_LIBRARIES} ${CMAKE_DL_LIBS} rt z)
endif ()
message (STATUS "Found HDF5 libraries: ${HDF5_LIBRARIES}")
find_package (GSL REQUIRED)
......@@ -158,7 +160,9 @@ set (Boost_USE_MULTITHREADED OFF)
set (Boost_USE_STATIC_RUNTIME OFF)
find_package (Boost 1.66.0
REQUIRED COMPONENTS filesystem iostreams regex serialization system timer chrono)
set (Boost_LIBRARIES ${Boost_LIBRARIES} rt)
if(UNIX AND NOT APPLE)
set (Boost_LIBRARIES ${Boost_LIBRARIES} rt)
endif ()
message (STATUS "Found Boost include dirs: ${Boost_INCLUDE_DIRS}")
message (STATUS "Found Boost library dirs: ${Boost_LIBRARY_DIRS}")
message (STATUS "Found Boost libraries: ${Boost_LIBRARIES}")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment