From 5a00c6a569528774a0aa7b1773219b571448ddbf Mon Sep 17 00:00:00 2001 From: Dmitry Mikushin Date: Wed, 21 Oct 2020 09:45:06 +0200 Subject: [PATCH] Changing TBB from static to shared --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f378d9dc..188cc098 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -154,13 +154,13 @@ endif() # TODO This should actually be a submodule of pagmo. # The only reason to have it here is to avoid forking pagmo as well. set(TBB_BUILD_TESTS OFF CACHE BOOL "" FORCE) -set(TBB_BUILD_SHARED OFF CACHE BOOL "" FORCE) -set(TBB_BUILD_STATIC ON CACHE BOOL "" FORCE) +set(TBB_BUILD_SHARED ON CACHE BOOL "" FORCE) +set(TBB_BUILD_STATIC OFF CACHE BOOL "" FORCE) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/tbb EXCLUDE_FROM_ALL) set(TBB_FOUND TRUE) -set(TBB_LIBRARIES tbb_static tbb_interface) +set(TBB_LIBRARIES tbb tbb_interface) set(TBB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ThirdParty/tbb/include) -add_library(TBB::tbb ALIAS tbb_static) +add_library(TBB::tbb ALIAS tbb) add_library(TBB::tbb_interface ALIAS tbb_interface) install(TARGETS ${TBB_LIBRARIES} EXPORT pagmo_export LIBRARY DESTINATION ${CMAKE_CURRENT_BINARY_DIR}