Skip to content
Snippets Groups Projects
Commit 22156718 authored by Ammar Nejati's avatar Ammar Nejati
Browse files

Merge branch 'removeUnneededBoost_1' into 'develop'

CMake: Remove unnecessary dependencies on C++ Boost libraries

See merge request !408
parents b16b7f7c 056068d9
No related branches found
No related tags found
1 merge request!408CMake: Remove unnecessary dependencies on C++ Boost libraries
Pipeline #47331 passed
......@@ -21,8 +21,6 @@ set(${lib}_LIBRARY ${lib} PARENT_SCOPE)
target_link_libraries(${lib}
PUBLIC
${GSL_LIBRARIES}
${Boost_LIBRARIES}
${Boost_Additional_Libraries}
${FFTW3_LIBRARIES}
)
target_include_directories(${lib}
......
......@@ -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} ${Boost_Additional_Libraries})
target_link_libraries(${library_name} ${GSL_LIBRARIES})
set(${library_name}_INCLUDE_DIRS ${include_dirs} CACHE INTERNAL "")
set(${library_name}_LIBRARY ${library_name} CACHE INTERNAL "")
......@@ -70,6 +70,8 @@ endif()
message(STATUS "Boost required libraries: ${boost_libraries_required}")
find_package(Boost 1.65.1 COMPONENTS ${boost_libraries_required})
message(STATUS "Boost: includes at ${Boost_INCLUDE_DIRS}, libraries at ${Boost_LIBRARY_DIRS}")
message(STATUS "Boost libraries: ${Boost_LIBRARIES}; ${Boost_Additional_Libraries}")
if(NOT Boost_FOUND)
message(FATAL_ERROR "Not all required Boost component libraries were found")
endif()
......
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