From f46e805c771b95ebe4edb09f8842257a07030ac7 Mon Sep 17 00:00:00 2001 From: Maxime Gimeno Date: Tue, 30 Jan 2018 14:09:47 +0100 Subject: [PATCH] Make inherit the usage of TBB in the cmake macro --- Installation/cmake/modules/CGAL_target_use_TBB.cmake | 6 +++--- Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Installation/cmake/modules/CGAL_target_use_TBB.cmake b/Installation/cmake/modules/CGAL_target_use_TBB.cmake index 2cb56b11ad9..23e9acd72f1 100644 --- a/Installation/cmake/modules/CGAL_target_use_TBB.cmake +++ b/Installation/cmake/modules/CGAL_target_use_TBB.cmake @@ -4,7 +4,7 @@ endif() set(CGAL_target_use_TBB_included TRUE) function(CGAL_target_use_TBB target) - target_include_directories ( ${target} SYSTEM PRIVATE ${TBB_INCLUDE_DIRS} ) - target_link_libraries( ${target} PRIVATE ${TBB_LIBRARIES} ) - target_compile_options( ${target} PRIVATE -DNOMINMAX -DCGAL_LINKED_WITH_TBB ) + target_include_directories ( ${target} SYSTEM PUBLIC ${TBB_INCLUDE_DIRS} ) + target_link_libraries( ${target} PUBLIC ${TBB_LIBRARIES} ) + target_compile_options( ${target} PUBLIC -DNOMINMAX -DCGAL_LINKED_WITH_TBB ) endfunction() diff --git a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt index bbc63ea2494..4f56e90cf35 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt @@ -48,9 +48,6 @@ if ( Boost_VERSION GREATER 103400 ) polyhedron_demo_plugin(c3t3_io_plugin C3t3_io_plugin) target_link_libraries(c3t3_io_plugin PUBLIC scene_c3t3_item) - if(TBB_FOUND) - CGAL_target_use_TBB(c3t3_io_plugin) - endif() else( Boost_VERSION GREATER 103400 ) message(STATUS "warning: the plugin mesh_3_plugin requires Boost>=1.34.1 and will not be compiled.") endif( Boost_VERSION GREATER 103400 ) @@ -62,4 +59,6 @@ target_link_libraries(c3t3_rib_exporter_plugin PUBLIC scene_c3t3_item) if(TBB_FOUND) CGAL_target_use_TBB(mesh_3_plugin) CGAL_target_use_TBB(mesh_3_optimization_plugin) + CGAL_target_use_TBB(c3t3_io_plugin) + CGAL_target_use_TBB(c3t3_rib_exporter_plugin) endif()