split boost libs / additional libs: Necessary for multi-config generators...

split boost libs / additional libs: Necessary for multi-config generators (continued in next commits)

Base/CMakeLists.txt

@@ -24,7 +24,7 @@ target_include_directories(${lib}
     PUBLIC ${CMAKE_SOURCE_DIR} ${GSL_INCLUDE_DIR} ${FFTW3_INCLUDE_DIR} ${Boost_INCLUDE_DIRS}
     SYSTEM PUBLIC ${EIGEN3_INCLUDE_DIRS}
     )
-target_link_libraries(${lib} ${GSL_LIBRARIES} ${FFTW3_LIBRARIES} ${Boost_LIBRARIES})
+target_link_libraries(${lib} ${GSL_LIBRARIES} ${FFTW3_LIBRARIES} ${Boost_LIBRARIES} ${Boost_Additional_Libraries})
 
 # g++ versions less than 9.1 need to link against libstdc++fs
 # if std::filesystem is used

Fit/3rdparty/RootMinimizers/CMakeLists.txt

@@ -38,7 +38,7 @@ add_library(${library_name} STATIC ${source_files})
 
 target_include_directories(${library_name}
     PUBLIC ${include_dirs} ${GSL_INCLUDE_DIR} ${Boost_INCLUDE_DIRS})
-target_link_libraries(${library_name} ${GSL_LIBRARIES} ${Boost_LIBRARIES})
+target_link_libraries(${library_name} ${GSL_LIBRARIES} ${Boost_LIBRARIES} ${Boost_Additional_Libraries})
 
 set(${library_name}_INCLUDE_DIRS ${include_dirs} CACHE INTERNAL "")
 set(${library_name}_LIBRARY ${library_name} CACHE INTERNAL "")

Fit/CMakeLists.txt

@@ -20,4 +20,4 @@ set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
 
 target_include_directories(${lib}
     PUBLIC ${RootMinimizers_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR})
-target_link_libraries(${lib} ${RootMinimizers_LIBRARY} ${Boost_LIBRARIES})
+target_link_libraries(${lib} ${RootMinimizers_LIBRARY} ${Boost_LIBRARIES} ${Boost_Additional_Libraries})

cmake/BornAgain/Dependences.cmake

@@ -48,8 +48,16 @@ if(NOT Boost_FOUND)
 endif()
 
 # requires these libs in target_link_libraries for win only
+set(Boost_Additional_Libraries "")
 if(WIN32)
-    list(APPEND Boost_LIBRARIES ${BZIP2_LIBRARIES} ${ZLIB_LIBRARIES} ${LIBLZMA_LIBRARIES} ${ZSTD_LIBRARY})
+    list(APPEND Boost_Additional_Libraries ${BZIP2_LIBRARIES} ${ZLIB_LIBRARIES} ${LIBLZMA_LIBRARIES} ${ZSTD_LIBRARY})
+endif()
+
+if(Boost_Additional_Libraries)
+    message(STATUS "Additional libraries required for Boost:")
+    foreach(lib ${Boost_Additional_Libraries})
+        message("    ${lib}")
+    endforeach()
 endif()
 
 # === optional packages ===