From e8f141603b64553000051ba2d8e7069edc1a6be4 Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Thu, 15 Nov 2018 15:40:26 +0100
Subject: [PATCH] CMake fix while accessing to boost libs.
---
Fit/CMakeLists.txt | 2 +-
ThirdParty/Fit/RootMinimizers/CMakeLists.txt | 9 +++------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/Fit/CMakeLists.txt b/Fit/CMakeLists.txt
index aa382c07704..346f7d7c019 100644
--- a/Fit/CMakeLists.txt
+++ b/Fit/CMakeLists.txt
@@ -110,7 +110,7 @@ set(${library_name}_LIBRARY ${library_name} PARENT_SCOPE)
# --- dependencies ---------
target_include_directories(${library_name} PUBLIC ${RootMinimizers_INCLUDE_DIRS})
target_include_directories(${library_name} PUBLIC ${include_dirs})
-target_link_libraries(${library_name} ${RootMinimizers_LIBRARY})
+target_link_libraries(${library_name} ${RootMinimizers_LIBRARY} ${Boost_LIBRARIES})
if(BORNAGAIN_PYTHON)
include_directories(${PYTHON_INCLUDE_DIRS} ${NUMPY_INCLUDE_DIR})
diff --git a/ThirdParty/Fit/RootMinimizers/CMakeLists.txt b/ThirdParty/Fit/RootMinimizers/CMakeLists.txt
index 3fc5047b640..d61e64d209b 100644
--- a/ThirdParty/Fit/RootMinimizers/CMakeLists.txt
+++ b/ThirdParty/Fit/RootMinimizers/CMakeLists.txt
@@ -10,8 +10,6 @@ set(include_dirs
${CMAKE_CURRENT_SOURCE_DIR}/mathcore
)
-include_directories(${include_dirs})
-
file(GLOB source_files
"Minuit2/*.cxx"
"mathcore/*.cxx"
@@ -46,7 +44,6 @@ set(${library_name}_INCLUDE_DIRS ${include_dirs} CACHE INTERNAL "")
set(${library_name}_LIBRARY ${library_name} CACHE INTERNAL "")
# --- external dependencies ---
-include_directories(${GSL_INCLUDE_DIR})
-target_link_libraries(${library_name} ${GSL_LIBRARIES})
-
-include_directories(${Boost_INCLUDE_DIRS})
+target_include_directories(${library_name} PUBLIC ${GSL_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
+target_link_libraries(${library_name} ${GSL_LIBRARIES} ${Boost_LIBRARIES})
+target_include_directories(${library_name} PUBLIC ${include_dirs})
--
GitLab