From 49f2d04d688c653f424e0b89c5c8f24ea18e2c92 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 9 Jul 2020 13:22:37 +0200 Subject: [PATCH 1/3] Sort target names --- Mesh_3/examples/Mesh_3/CMakeLists.txt | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/Mesh_3/examples/Mesh_3/CMakeLists.txt b/Mesh_3/examples/Mesh_3/CMakeLists.txt index 12cdc539c11..0233e79e5ce 100644 --- a/Mesh_3/examples/Mesh_3/CMakeLists.txt +++ b/Mesh_3/examples/Mesh_3/CMakeLists.txt @@ -121,21 +121,21 @@ if ( CGAL_FOUND ) if(CGAL_ACTIVATE_CONCURRENT_MESH_3 AND TBB_FOUND AND TARGET ${target}) foreach(target - mesh_3D_image_with_features mesh_3D_image - mesh_polyhedral_domain + mesh_3D_image_variable_size mesh_3D_image_with_custom_initialization - mesh_two_implicit_spheres_with_balls - mesh_optimization_lloyd_example - mesh_optimization_example + mesh_3D_image_with_features mesh_implicit_sphere - mesh_polyhedral_complex_sm mesh_implicit_sphere_variable_size - mesh_polyhedral_domain_sm - mesh_polyhedral_domain_with_lipschitz_sizing + mesh_optimization_example + mesh_optimization_lloyd_example mesh_polyhedral_complex + mesh_polyhedral_complex_sm + mesh_polyhedral_domain + mesh_polyhedral_domain_sm mesh_polyhedral_domain_with_features - mesh_3D_image_variable_size) + mesh_polyhedral_domain_with_lipschitz_sizing + mesh_two_implicit_spheres_with_balls) CGAL_target_use_TBB(${target}) endforeach() endif() @@ -143,4 +143,3 @@ if ( CGAL_FOUND ) else() message(STATUS "This program requires the CGAL library, and will not be compiled.") endif() - From ae40fec6a3f774b8056d2beed817191458e2fad1 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 9 Jul 2020 13:23:55 +0200 Subject: [PATCH 2/3] Missing target --- Mesh_3/examples/Mesh_3/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Mesh_3/examples/Mesh_3/CMakeLists.txt b/Mesh_3/examples/Mesh_3/CMakeLists.txt index 0233e79e5ce..8619f143045 100644 --- a/Mesh_3/examples/Mesh_3/CMakeLists.txt +++ b/Mesh_3/examples/Mesh_3/CMakeLists.txt @@ -134,6 +134,7 @@ if ( CGAL_FOUND ) mesh_polyhedral_domain mesh_polyhedral_domain_sm mesh_polyhedral_domain_with_features + mesh_polyhedral_domain_with_features_sm mesh_polyhedral_domain_with_lipschitz_sizing mesh_two_implicit_spheres_with_balls) CGAL_target_use_TBB(${target}) From 9bf27c6763ed0a7bb2448d3e20a17974c606b32a Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 9 Jul 2020 13:24:08 +0200 Subject: [PATCH 3/3] Fix the link with TBB --- Mesh_3/examples/Mesh_3/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Mesh_3/examples/Mesh_3/CMakeLists.txt b/Mesh_3/examples/Mesh_3/CMakeLists.txt index 8619f143045..47dbc19a7c9 100644 --- a/Mesh_3/examples/Mesh_3/CMakeLists.txt +++ b/Mesh_3/examples/Mesh_3/CMakeLists.txt @@ -119,7 +119,7 @@ if ( CGAL_FOUND ) # create_single_source_cgal_program( "mesh_polyhedral_surface_tolerance_region.cpp" ) # create_single_source_cgal_program( "mesh_polyhedral_edge_tolerance_region.cpp" ) - if(CGAL_ACTIVATE_CONCURRENT_MESH_3 AND TBB_FOUND AND TARGET ${target}) + if(CGAL_ACTIVATE_CONCURRENT_MESH_3 AND TBB_FOUND) foreach(target mesh_3D_image mesh_3D_image_variable_size @@ -137,7 +137,9 @@ if ( CGAL_FOUND ) mesh_polyhedral_domain_with_features_sm mesh_polyhedral_domain_with_lipschitz_sizing mesh_two_implicit_spheres_with_balls) - CGAL_target_use_TBB(${target}) + if(TARGET ${target}) + CGAL_target_use_TBB(${target}) + endif() endforeach() endif()