From f12b3bf302dafe4ae5015c7dc2b7ad77b0917be5 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 8 Mar 2018 12:07:49 +0100 Subject: [PATCH] Prefix CMake options with `CGAL_` - in `examples/Mesh_3/`, - in `examples/Point_set_processing_3/`, - in `demo/Polyhedron/`, and - in `demo/Triangulation_3/`. --- Mesh_3/benchmark/Mesh_3/CMakeLists.txt | 4 ++-- Mesh_3/examples/Mesh_3/CMakeLists.txt | 6 +++--- .../examples/Point_set_processing_3/CMakeLists.txt | 4 ++-- Polyhedron/demo/Polyhedron/CMakeLists.txt | 6 +++--- Triangulation_3/demo/Triangulation_3/CMakeLists.txt | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Mesh_3/benchmark/Mesh_3/CMakeLists.txt b/Mesh_3/benchmark/Mesh_3/CMakeLists.txt index 9222bff6fe1..9b359370bef 100644 --- a/Mesh_3/benchmark/Mesh_3/CMakeLists.txt +++ b/Mesh_3/benchmark/Mesh_3/CMakeLists.txt @@ -52,12 +52,12 @@ if ( CGAL_FOUND ) include( ${CGAL_USE_FILE} ) # Activate concurrency ? (turned OFF by default) - option(ACTIVATE_CONCURRENT_MESH_3 + option(CGAL_ACTIVATE_CONCURRENT_MESH_3 "Activate parallelism in Mesh_3" OFF) # And add -DCGAL_CONCURRENT_MESH_3 if that option is ON - if( ACTIVATE_CONCURRENT_MESH_3 ) + if( CGAL_ACTIVATE_CONCURRENT_MESH_3 ) add_definitions( -DCGAL_CONCURRENT_MESH_3 ) find_package( TBB REQUIRED ) else() diff --git a/Mesh_3/examples/Mesh_3/CMakeLists.txt b/Mesh_3/examples/Mesh_3/CMakeLists.txt index bd3429d445d..30762fed754 100644 --- a/Mesh_3/examples/Mesh_3/CMakeLists.txt +++ b/Mesh_3/examples/Mesh_3/CMakeLists.txt @@ -22,15 +22,15 @@ if ( CGAL_FOUND ) find_package(Boost) # Activate concurrency ? (turned OFF by default) - option(ACTIVATE_CONCURRENT_MESH_3 + option(CGAL_ACTIVATE_CONCURRENT_MESH_3 "Activate parallelism in Mesh_3" OFF) # And add -DCGAL_CONCURRENT_MESH_3 if that option is ON - if( ACTIVATE_CONCURRENT_MESH_3 OR ENV{ACTIVATE_CONCURRENT_MESH_3} ) + if( CGAL_ACTIVATE_CONCURRENT_MESH_3 OR ENV{CGAL_ACTIVATE_CONCURRENT_MESH_3} ) add_definitions( -DCGAL_CONCURRENT_MESH_3 ) find_package( TBB REQUIRED ) - else( ACTIVATE_CONCURRENT_MESH_3 OR ENV{ACTIVATE_CONCURRENT_MESH_3} ) + else( CGAL_ACTIVATE_CONCURRENT_MESH_3 OR ENV{CGAL_ACTIVATE_CONCURRENT_MESH_3} ) option( LINK_WITH_TBB "Link with TBB anyway so we can use TBB timers for profiling" ON) diff --git a/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt b/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt index ad21bce96c0..2712f080b1c 100644 --- a/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt +++ b/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt @@ -33,11 +33,11 @@ if ( CGAL_FOUND ) endif() # Activate concurrency? - option(ACTIVATE_CONCURRENT_PSP3 + option(CGAL_ACTIVATE_CONCURRENT_PSP3 "Enable concurrency" OFF) - if( ACTIVATE_CONCURRENT_PSP3 OR ENV{ACTIVATE_CONCURRENT_PSP3} ) + if( CGAL_ACTIVATE_CONCURRENT_PSP3 OR ENV{CGAL_ACTIVATE_CONCURRENT_PSP3} ) find_package( TBB REQUIRED ) endif() diff --git a/Polyhedron/demo/Polyhedron/CMakeLists.txt b/Polyhedron/demo/Polyhedron/CMakeLists.txt index 9a9e122b54d..ea2380c692b 100644 --- a/Polyhedron/demo/Polyhedron/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/CMakeLists.txt @@ -94,12 +94,12 @@ endif() # Activate concurrency ? (turned OFF by default) -option(ACTIVATE_CONCURRENT_MESH_3 +option(CGAL_ACTIVATE_CONCURRENT_MESH_3 "Activate parallelism in Mesh_3" OFF) # And add -DCGAL_CONCURRENT_MESH_3 if that option is ON -if( ACTIVATE_CONCURRENT_MESH_3 OR ENV{ACTIVATE_CONCURRENT_MESH_3} ) +if( CGAL_ACTIVATE_CONCURRENT_MESH_3 OR ENV{CGAL_ACTIVATE_CONCURRENT_MESH_3} ) add_definitions( -DCGAL_CONCURRENT_MESH_3 ) if(NOT TBB_FOUND) find_package( TBB REQUIRED ) @@ -108,7 +108,7 @@ if( ACTIVATE_CONCURRENT_MESH_3 OR ENV{ACTIVATE_CONCURRENT_MESH_3} ) endif() endif() -else( ACTIVATE_CONCURRENT_MESH_3 OR ENV{ACTIVATE_CONCURRENT_MESH_3} ) +else( CGAL_ACTIVATE_CONCURRENT_MESH_3 OR ENV{CGAL_ACTIVATE_CONCURRENT_MESH_3} ) option( LINK_WITH_TBB "Link with TBB anyway so we can use TBB timers for profiling" ON) diff --git a/Triangulation_3/demo/Triangulation_3/CMakeLists.txt b/Triangulation_3/demo/Triangulation_3/CMakeLists.txt index bef93004739..c0c438c5eb4 100644 --- a/Triangulation_3/demo/Triangulation_3/CMakeLists.txt +++ b/Triangulation_3/demo/Triangulation_3/CMakeLists.txt @@ -30,15 +30,15 @@ if(Qt5_FOUND) endif(Qt5_FOUND) # Activate concurrency ? (turned OFF by default) -option(ACTIVATE_CONCURRENT_TRIANGULATION_3 +option(CGAL_ACTIVATE_CONCURRENT_TRIANGULATION_3 "Activate parallelism in Triangulation_3" OFF) # And add -DCGAL_CONCURRENT_TRIANGULATION_3 if that option is ON -if( ACTIVATE_CONCURRENT_TRIANGULATION_3 ) +if( CGAL_ACTIVATE_CONCURRENT_TRIANGULATION_3 ) add_definitions( -DCGAL_CONCURRENT_TRIANGULATION_3 ) find_package( TBB REQUIRED ) -else( ACTIVATE_CONCURRENT_TRIANGULATION_3 ) +else( CGAL_ACTIVATE_CONCURRENT_TRIANGULATION_3 ) option( LINK_WITH_TBB "Link with TBB anyway so we can use TBB timers for profiling" ON)