songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make inherit the usage of TBB in the cmake macro

This commit is contained in:
Maxime Gimeno 2018-01-30 14:09:47 +01:00
parent 60b2f8ac58
commit f46e805c77
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Installation/cmake/modules/CGAL_target_use_TBB.cmake
View File

@ -4,7 +4,7 @@ endif()
set(CGAL_target_use_TBB_included TRUE) set(CGAL_target_use_TBB_included TRUE)
function(CGAL_target_use_TBB target) function(CGAL_target_use_TBB target)
target_include_directories ( ${target} SYSTEM PRIVATE ${TBB_INCLUDE_DIRS} ) target_include_directories ( ${target} SYSTEM PUBLIC ${TBB_INCLUDE_DIRS} )
target_link_libraries( ${target} PRIVATE ${TBB_LIBRARIES} ) target_link_libraries( ${target} PUBLIC ${TBB_LIBRARIES} )
target_compile_options( ${target} PRIVATE -DNOMINMAX -DCGAL_LINKED_WITH_TBB ) target_compile_options( ${target} PUBLIC -DNOMINMAX -DCGAL_LINKED_WITH_TBB )
endfunction() endfunction()

5
Polyhedron/demo/Polyhedron/Plugins/Mesh_3/CMakeLists.txt
View File

@ -48,9 +48,6 @@ if ( Boost_VERSION GREATER 103400 )
polyhedron_demo_plugin(c3t3_io_plugin C3t3_io_plugin) polyhedron_demo_plugin(c3t3_io_plugin C3t3_io_plugin)
target_link_libraries(c3t3_io_plugin PUBLIC scene_c3t3_item) 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 ) else( Boost_VERSION GREATER 103400 )
message(STATUS "warning: the plugin mesh_3_plugin requires Boost>=1.34.1 and will not be compiled.") message(STATUS "warning: the plugin mesh_3_plugin requires Boost>=1.34.1 and will not be compiled.")
endif( Boost_VERSION GREATER 103400 ) endif( Boost_VERSION GREATER 103400 )
@ -62,4 +59,6 @@ target_link_libraries(c3t3_rib_exporter_plugin PUBLIC scene_c3t3_item)
if(TBB_FOUND) if(TBB_FOUND)
CGAL_target_use_TBB(mesh_3_plugin) CGAL_target_use_TBB(mesh_3_plugin)
CGAL_target_use_TBB(mesh_3_optimization_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() endif()