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

Merge pull request #2911 from lrineau/CGAL-prefix_CMake_options_with_CGAL-GF 

Prefix CMake options with `CGAL_`
This commit is contained in:
Laurent Rineau 2018-03-09 18:41:24 +01:00
parent a06d390fd4 f12b3bf302
commit e687e38d9c
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mesh_3/benchmark/Mesh_3/CMakeLists.txt
View File

@ -52,12 +52,12 @@ if ( CGAL_FOUND )
include( ${CGAL_USE_FILE} ) include( ${CGAL_USE_FILE} )
# Activate concurrency ? (turned OFF by default) # Activate concurrency ? (turned OFF by default)
option(ACTIVATE_CONCURRENT_MESH_3 option(CGAL_ACTIVATE_CONCURRENT_MESH_3
"Activate parallelism in Mesh_3" "Activate parallelism in Mesh_3"
OFF) OFF)
# And add -DCGAL_CONCURRENT_MESH_3 if that option is ON # 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 ) add_definitions( -DCGAL_CONCURRENT_MESH_3 )
find_package( TBB REQUIRED ) find_package( TBB REQUIRED )
else() else()

6
Mesh_3/examples/Mesh_3/CMakeLists.txt
View File

@ -22,15 +22,15 @@ if ( CGAL_FOUND )
find_package(Boost) find_package(Boost)
# Activate concurrency ? (turned OFF by default) # Activate concurrency ? (turned OFF by default)
option(ACTIVATE_CONCURRENT_MESH_3 option(CGAL_ACTIVATE_CONCURRENT_MESH_3
"Activate parallelism in Mesh_3" "Activate parallelism in Mesh_3"
OFF) OFF)
# And add -DCGAL_CONCURRENT_MESH_3 if that option is ON # 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 ) add_definitions( -DCGAL_CONCURRENT_MESH_3 )
find_package( TBB REQUIRED ) 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 option( LINK_WITH_TBB
"Link with TBB anyway so we can use TBB timers for profiling" "Link with TBB anyway so we can use TBB timers for profiling"
ON) ON)

4
Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt
View File

@ -33,11 +33,11 @@ if ( CGAL_FOUND )
endif() endif()
# Activate concurrency? # Activate concurrency?
option(ACTIVATE_CONCURRENT_PSP3 option(CGAL_ACTIVATE_CONCURRENT_PSP3
"Enable concurrency" "Enable concurrency"
OFF) 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 ) find_package( TBB REQUIRED )
endif() endif()

6
Polyhedron/demo/Polyhedron/CMakeLists.txt
View File

@ -94,12 +94,12 @@ endif()
# Activate concurrency ? (turned OFF by default) # Activate concurrency ? (turned OFF by default)
option(ACTIVATE_CONCURRENT_MESH_3 option(CGAL_ACTIVATE_CONCURRENT_MESH_3
"Activate parallelism in Mesh_3" "Activate parallelism in Mesh_3"
OFF) OFF)
# And add -DCGAL_CONCURRENT_MESH_3 if that option is ON # 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 ) add_definitions( -DCGAL_CONCURRENT_MESH_3 )
if(NOT TBB_FOUND) if(NOT TBB_FOUND)
find_package( TBB REQUIRED ) find_package( TBB REQUIRED )
@ -108,7 +108,7 @@ if( ACTIVATE_CONCURRENT_MESH_3 OR ENV{ACTIVATE_CONCURRENT_MESH_3} )
endif() endif()
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 option( LINK_WITH_TBB
"Link with TBB anyway so we can use TBB timers for profiling" "Link with TBB anyway so we can use TBB timers for profiling"
ON) ON)

6
Triangulation_3/demo/Triangulation_3/CMakeLists.txt
View File

@ -30,15 +30,15 @@ if(Qt5_FOUND)
endif(Qt5_FOUND) endif(Qt5_FOUND)
# Activate concurrency ? (turned OFF by default) # Activate concurrency ? (turned OFF by default)
option(ACTIVATE_CONCURRENT_TRIANGULATION_3 option(CGAL_ACTIVATE_CONCURRENT_TRIANGULATION_3
"Activate parallelism in Triangulation_3" "Activate parallelism in Triangulation_3"
OFF) OFF)
# And add -DCGAL_CONCURRENT_TRIANGULATION_3 if that option is ON # 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 ) add_definitions( -DCGAL_CONCURRENT_TRIANGULATION_3 )
find_package( TBB REQUIRED ) find_package( TBB REQUIRED )
else( ACTIVATE_CONCURRENT_TRIANGULATION_3 ) else( CGAL_ACTIVATE_CONCURRENT_TRIANGULATION_3 )
option( LINK_WITH_TBB option( LINK_WITH_TBB
"Link with TBB anyway so we can use TBB timers for profiling" "Link with TBB anyway so we can use TBB timers for profiling"
ON) ON)