Skip to content

Commit

Permalink
Merge pull request SyneRBI#1109 from SyneRBI/paskino-patch-1
Browse files Browse the repository at this point in the history
bugfix in use of find_package
  • Loading branch information
paskino authored May 20, 2022
2 parents 25767bf + 0a5dae0 commit f5b5ede
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ endif(APPLE)
# If OSX, we might need to assume pthreads. For this, first try to find boost_thread.
# If that fails, then give a bit of help.
if (APPLE)
find_package(Boost COMPONENTS thread QUIET)
find_package(Boost QUIET COMPONENTS thread)
if (NOT boost_thread_FOUND)
set(CMAKE_THREAD_LIBS_INIT "-lpthread")
set(CMAKE_HAVE_THREADS_LIBRARY 1)
Expand All @@ -103,7 +103,7 @@ endif()

#### we need the boost library from boost.org
set(BOOST_ROOT CACHE PATH "root of Boost")
find_package(Boost 1.36.0 COMPONENTS system filesystem thread date_time chrono REQUIRED)
find_package(Boost 1.36.0 REQUIRED COMPONENTS system filesystem thread date_time chrono)
# For Visual Studio we have to disable the auto-linking feature of boost
# where just including a boost file automatically adds it to the linker path.
# Although this sounds great, it sadly breaks because of conflicting file-paths when linking etc etc.
Expand Down Expand Up @@ -176,7 +176,7 @@ if (DISABLE_Matlab)
message(STATUS "Matlab support disabled")
else(DISABLE_Matlab)

FIND_PACKAGE(Matlab QUIET COMPONENTS MAIN_PROGRAM)
find_package(Matlab QUIET COMPONENTS MAIN_PROGRAM)
if (NOT Matlab_FOUND)
message(WARNING "MATLAB not found. Set Matlab_ROOT_DIR if you want it. Set DISABLE_Matlab to ON to silence this warning.")
else()
Expand Down Expand Up @@ -215,7 +215,7 @@ if (CMAKE_VERSION VERSION_LESS 3.21.0)
#
# Note that this is slightly dangerous if there are multiple versions of HDF5 on the system.
# ISMRMRD and STIR might be looking for a specific version while the statement below doesn't.
find_package(HDF5 COMPONENTS C CXX QUIET)
find_package(HDF5 QUIET COMPONENTS C CXX)
endif()

ADD_SUBDIRECTORY(src)
Expand Down

0 comments on commit f5b5ede

Please sign in to comment.