Re-add include({CGAL_USE_FILE} ) in each CMakeLists.txt where CGAL is used with some component.

2018-10-18 14:38:42 +02:00 · 2018-10-18 14:38:42 +02:00 · 0c2dcf7208
parent a1474a74d2
commit 0c2dcf7208
45 changed files with 74 additions and 3 deletions
--- a/Algebraic_foundations/test/Algebraic_foundations/CMakeLists.txt
+++ b/Algebraic_foundations/test/Algebraic_foundations/CMakeLists.txt
@ -10,6 +10,8 @@ find_package(CGAL QUIET COMPONENTS Core)

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  # create a target per cppfile
  file(GLOB cppfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
  foreach(cppfile ${cppfiles})
--- a/Algebraic_kernel_d/examples/Algebraic_kernel_d/CMakeLists.txt
+++ b/Algebraic_kernel_d/examples/Algebraic_kernel_d/CMakeLists.txt
@ -11,6 +11,7 @@ endif()

 if( CGAL_FOUND AND MPFI_FOUND)

+  include(${CGAL_USE_FILE})
  include( ${MPFI_USE_FILE} )
  include( CGAL_VersionUtils )

--- a/Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt
+++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt
@ -37,6 +37,7 @@ endif()
 include_directories( BEFORE include )

 # include for local package
+  include(${CGAL_USE_FILE})

 # Creating entries for all .cpp/.C files with "main" routine
 # ##########################################################
--- a/Apollonius_graph_2/examples/Apollonius_graph_2/CMakeLists.txt
+++ b/Apollonius_graph_2/examples/Apollonius_graph_2/CMakeLists.txt
@ -10,6 +10,8 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  # create a target per cppfile
  file(GLOB cppfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
  foreach(cppfile ${cppfiles})
--- a/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt
+++ b/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt
@ -14,6 +14,7 @@ find_package(GMP QUIET)

 if ( CGAL_FOUND AND GMP_FOUND )

+  include(${CGAL_USE_FILE})
  include( CGAL_VersionUtils )
  
  get_dependency_version( GMP )
--- a/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/CMakeLists.txt
+++ b/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/CMakeLists.txt
@ -10,6 +10,8 @@ find_package(CGAL QUIET COMPONENTS Core)

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  # create a target per cppfile
  file(GLOB cppfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
  foreach(cppfile ${cppfiles})
--- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/CMakeLists.txt
+++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/CMakeLists.txt
@ -12,6 +12,8 @@ find_package(CGAL QUIET COMPONENTS Core)

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  if(COMMAND target_compile_options)
    # Since CMake-2.8.12: New CMake script, that defines the targets and
    # the CTest test cases.
--- a/Boolean_set_operations_2/examples/Boolean_set_operations_2/CMakeLists.txt
+++ b/Boolean_set_operations_2/examples/Boolean_set_operations_2/CMakeLists.txt
@ -6,10 +6,12 @@ project( Boolean_set_operations_2_Examples )

 cmake_minimum_required(VERSION 2.8.10)

-find_package(CGAL QUIET COMPONENTS Core )
+find_package(CGAL QUIET COMPONENTS Core)

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  # create a target per cppfile
  file(GLOB cppfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
  foreach(cppfile ${cppfiles})
--- a/Bounding_volumes/test/Bounding_volumes/CMakeLists.txt
+++ b/Bounding_volumes/test/Bounding_volumes/CMakeLists.txt
@ -10,6 +10,8 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  # Use Eigen
  find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater)
  if (EIGEN3_FOUND)
--- a/CGAL_Core/examples/Core/CMakeLists.txt
+++ b/CGAL_Core/examples/Core/CMakeLists.txt
@ -29,6 +29,7 @@ endif()
 # include for local directory

 # include for local package
+include(${CGAL_USE_FILE})

 # Creating entries for all .cpp/.C files with "main" routine
 # ##########################################################
--- a/CGAL_ImageIO/examples/CGALimageIO/CMakeLists.txt
+++ b/CGAL_ImageIO/examples/CGALimageIO/CMakeLists.txt
@ -8,6 +8,8 @@ cmake_minimum_required(VERSION 2.8.11)
 find_package(CGAL QUIET COMPONENTS ImageIO )

 if(CGAL_ImageIO_FOUND)
+  include(${CGAL_USE_FILE})
+
  create_single_source_cgal_program( "convert_raw_image_to_inr.cpp" )
  create_single_source_cgal_program( "test_imageio.cpp" )
 else()
--- a/CGAL_ImageIO/test/CGAL_ImageIO/CMakeLists.txt
+++ b/CGAL_ImageIO/test/CGAL_ImageIO/CMakeLists.txt
@ -9,6 +9,7 @@ cmake_minimum_required(VERSION 2.8.11)
 find_package(CGAL QUIET COMPONENTS ImageIO )

 if ( CGAL_FOUND )
+  include(${CGAL_USE_FILE})

  if (WITH_CGAL_ImageIO) 
    create_single_source_cgal_program( "test_trilinear_interpolation.cpp" )
--- a/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt
+++ b/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt
@ -24,6 +24,8 @@ find_package(CGAL QUIET COMPONENTS Core)

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
  if (EIGEN3_FOUND)
    include( ${EIGEN3_USE_FILE} )
--- a/Circular_kernel_3/test/Circular_kernel_3/CMakeLists.txt
+++ b/Circular_kernel_3/test/Circular_kernel_3/CMakeLists.txt
@ -10,6 +10,8 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+include(${CGAL_USE_FILE})
+
 include_directories (BEFORE include)
 include_directories (BEFORE ../../../Kernel_23/test/Kernel_23/include)
 include_directories (BEFORE ../Kernel_23/include)
--- a/Cone_spanners_2/examples/Cone_spanners_2/CMakeLists.txt
+++ b/Cone_spanners_2/examples/Cone_spanners_2/CMakeLists.txt
@ -9,6 +9,7 @@ cmake_minimum_required(VERSION 2.8.10)
 find_package(CGAL QUIET COMPONENTS Core)

 if ( CGAL_FOUND AND CGAL_Core_FOUND)
+  include(${CGAL_USE_FILE})

  if (MSVC)
    # Turn off a boost related warning that appears with VC2015
--- a/Cone_spanners_2/test/Cone_spanners_2/CMakeLists.txt
+++ b/Cone_spanners_2/test/Cone_spanners_2/CMakeLists.txt
@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 2.8.10)
 find_package(CGAL QUIET COMPONENTS Core)

 if ( CGAL_FOUND AND CGAL_Core_FOUND)
-
+  include(${CGAL_USE_FILE})
  include_directories (BEFORE "include")

  # create a target per cppfile
--- a/Envelope_3/examples/Envelope_3/CMakeLists.txt
+++ b/Envelope_3/examples/Envelope_3/CMakeLists.txt
@ -10,6 +10,8 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  # create a target per cppfile
  file(GLOB cppfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
  foreach(cppfile ${cppfiles})
--- a/Envelope_3/test/Envelope_3/CMakeLists.txt
+++ b/Envelope_3/test/Envelope_3/CMakeLists.txt
@ -10,6 +10,8 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  # create a target per cppfile
  file(GLOB cppfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
  foreach(cppfile ${cppfiles})
--- a/Filtered_kernel/benchmark/Filtered_kernel/CMakeLists.txt
+++ b/Filtered_kernel/benchmark/Filtered_kernel/CMakeLists.txt
@ -13,6 +13,8 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  add_executable( bench_orientation_3 "orientation_3.cpp" )
  target_link_libraries(bench_orientation_3 ${CGAL_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} )

--- a/Generator/benchmark/Generator/CMakeLists.txt
+++ b/Generator/benchmark/Generator/CMakeLists.txt
@ -11,6 +11,8 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  find_package(Boost REQUIRED program_options)
  include_directories(${Boost_PROGRAM_OPTIONS_INCLUDE_DIR})
  add_definitions( "-DCGAL_USE_BOOST_PROGRAM_OPTIONS" )
--- a/Interval_support/test/Interval_support/CMakeLists.txt
+++ b/Interval_support/test/Interval_support/CMakeLists.txt
@ -10,6 +10,8 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  # create a target per cppfile
  file(GLOB cppfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
  foreach(cppfile ${cppfiles})
--- a/Kernel_23/test/Kernel_23/CMakeLists.txt
+++ b/Kernel_23/test/Kernel_23/CMakeLists.txt
@ -10,6 +10,7 @@ find_package(CGAL QUIET COMPONENTS Core)

 if ( CGAL_FOUND AND CGAL_Core_FOUND)

+  include(${CGAL_USE_FILE})
  include_directories (BEFORE "include")

  # create a target per cppfile
--- a/Mesh_2/test/Mesh_2/CMakeLists.txt
+++ b/Mesh_2/test/Mesh_2/CMakeLists.txt
@ -10,6 +10,8 @@ find_package(CGAL QUIET COMPONENTS Core)

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  # create a target per cppfile
  file(GLOB cppfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
  foreach(cppfile ${cppfiles})
--- a/Minkowski_sum_2/examples/Minkowski_sum_2/CMakeLists.txt
+++ b/Minkowski_sum_2/examples/Minkowski_sum_2/CMakeLists.txt
@ -10,6 +10,8 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  # create a target per cppfile
  file(GLOB cppfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
  foreach(cppfile ${cppfiles})
--- a/Minkowski_sum_2/test/Minkowski_sum_2/CMakeLists.txt
+++ b/Minkowski_sum_2/test/Minkowski_sum_2/CMakeLists.txt
@ -21,6 +21,8 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  # create a target per cppfile
  file(GLOB cppfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
  foreach(cppfile ${cppfiles})
--- a/Modular_arithmetic/test/Modular_arithmetic/CMakeLists.txt
+++ b/Modular_arithmetic/test/Modular_arithmetic/CMakeLists.txt
@ -10,6 +10,8 @@ find_package(CGAL QUIET COMPONENTS Core)

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  # create a target per cppfile
  file(GLOB cppfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
  foreach(cppfile ${cppfiles})
--- a/Number_types/test/Number_types/CMakeLists.txt
+++ b/Number_types/test/Number_types/CMakeLists.txt
@ -12,6 +12,7 @@ find_package( CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
  include( CGAL_VersionUtils )

  include_directories( BEFORE include )
--- a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/CMakeLists.txt
+++ b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/CMakeLists.txt
@ -10,6 +10,7 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
  include_directories (BEFORE "include")

  create_single_source_cgal_program( "test_p3rt3_as_p3t3.cpp" )
--- a/Polynomial/test/Polynomial/CMakeLists.txt
+++ b/Polynomial/test/Polynomial/CMakeLists.txt
@ -10,6 +10,7 @@ find_package(CGAL QUIET COMPONENTS Core)

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
  include_directories (BEFORE "include")

  # create a target per cppfile
--- a/STL_Extension/benchmark/copy_n_benchmark/CMakeLists.txt
+++ b/STL_Extension/benchmark/copy_n_benchmark/CMakeLists.txt
@ -11,11 +11,12 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  create_single_source_cgal_program( "copy_n_benchmark.cpp" )

  create_single_source_cgal_program( "copy_n_use_case_benchmark.cpp" )

-
 else()
  
    message(STATUS "This program requires the CGAL library, and will not be compiled.")
--- a/Segment_Delaunay_graph_2/benchmark/Segment_Delaunay_graph_2/CMakeLists.txt
+++ b/Segment_Delaunay_graph_2/benchmark/Segment_Delaunay_graph_2/CMakeLists.txt
@ -11,6 +11,8 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  create_single_source_cgal_program( "benchmark.cpp" )
  create_single_source_cgal_program( "benchmark_nox.cpp" )
  create_single_source_cgal_program( "double.cpp" )
--- a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/CMakeLists.txt
+++ b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/CMakeLists.txt
@ -10,6 +10,7 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
  include_directories (BEFORE "include")

  # create a target per cppfile
--- a/Segment_Delaunay_graph_Linf_2/benchmark/Segment_Delaunay_graph_Linf_2/CMakeLists.txt
+++ b/Segment_Delaunay_graph_Linf_2/benchmark/Segment_Delaunay_graph_Linf_2/CMakeLists.txt
@ -11,6 +11,8 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  create_single_source_cgal_program( "sdg-creation-time.cpp" )
  create_single_source_cgal_program( "benchmark-gen.cpp" )
  create_single_source_cgal_program( "incirc.cpp" )
--- a/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/CMakeLists.txt
+++ b/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/CMakeLists.txt
@ -10,6 +10,7 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
  include_directories (BEFORE "include")

  # create a target per cppfile
--- a/Spatial_searching/benchmark/Spatial_searching/CMakeLists.txt
+++ b/Spatial_searching/benchmark/Spatial_searching/CMakeLists.txt
@ -10,6 +10,8 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+include(${CGAL_USE_FILE})
+
 find_package(Eigen3 3.1.91) #(requires 3.2.0 or greater)
 if (EIGEN3_FOUND)
  include( ${EIGEN3_USE_FILE} )
--- a/Spatial_searching/benchmark/Spatial_searching/tools/CMakeLists.txt
+++ b/Spatial_searching/benchmark/Spatial_searching/tools/CMakeLists.txt
@ -10,6 +10,7 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
  include_directories (BEFORE "../include")

  create_single_source_cgal_program( "points_in_bbox.cpp" )
--- a/Spatial_sorting/benchmark/Spatial_sorting/CMakeLists.txt
+++ b/Spatial_sorting/benchmark/Spatial_sorting/CMakeLists.txt
@ -11,6 +11,7 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
  create_single_source_cgal_program( "simple.cpp" )

 else()
--- a/Straight_skeleton_2/examples/Straight_skeleton_2/CMakeLists.txt
+++ b/Straight_skeleton_2/examples/Straight_skeleton_2/CMakeLists.txt
@ -10,6 +10,8 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  # create a target per cppfile
  file(GLOB cppfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
  foreach(cppfile ${cppfiles})
--- a/Straight_skeleton_2/test/Straight_skeleton_2/CMakeLists.txt
+++ b/Straight_skeleton_2/test/Straight_skeleton_2/CMakeLists.txt
@ -10,6 +10,7 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
  include_directories (BEFORE "include")

  # create a target per cppfile
--- a/Surface_mesh_deformation/benchmark/Surface_mesh_deformation/optimal_rotation/CMakeLists.txt
+++ b/Surface_mesh_deformation/benchmark/Surface_mesh_deformation/optimal_rotation/CMakeLists.txt
@ -7,6 +7,8 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)
  if (EIGEN3_FOUND)
    include( ${EIGEN3_USE_FILE} )
--- a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/CMakeLists.txt
+++ b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/CMakeLists.txt
@ -11,6 +11,7 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
  include_directories (BEFORE "include")

  create_single_source_cgal_program( "Surface_mesh_shortest_path_test_1.cpp" )
--- a/Surface_mesher/examples/Surface_mesher/CMakeLists.txt
+++ b/Surface_mesher/examples/Surface_mesher/CMakeLists.txt
@ -9,6 +9,8 @@ find_package(CGAL QUIET COMPONENTS ImageIO)

 if ( CGAL_FOUND AND CGAL_ImageIO_FOUND )

+  include(${CGAL_USE_FILE})
+
  create_single_source_cgal_program( "mesh_a_3d_gray_image.cpp" )
  create_single_source_cgal_program( "mesh_an_implicit_function.cpp" )

--- a/Surface_sweep_2/test/Surface_sweep_2/CMakeLists.txt
+++ b/Surface_sweep_2/test/Surface_sweep_2/CMakeLists.txt
@ -19,6 +19,8 @@ set(WALK 3)

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  function(compile name source_file point_location traits)
 #    message(compile ${source_file})
    add_executable(${name} ${source_file})
--- a/Three/demo/Three/CMakeLists.txt
+++ b/Three/demo/Three/CMakeLists.txt
@ -12,6 +12,8 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+    include(${CGAL_USE_FILE})
+
 else()
  
    message(STATUS "This program requires the CGAL library, and will not be compiled.")
--- a/Triangulation/benchmark/Triangulation/CMakeLists.txt
+++ b/Triangulation/benchmark/Triangulation/CMakeLists.txt
@ -11,6 +11,8 @@ find_package(CGAL QUIET COMPONENTS Core )

 if ( CGAL_FOUND )

+  include(${CGAL_USE_FILE})
+
  find_package(Eigen3 3.1.0) 
  if (EIGEN3_FOUND) 
    include( ${EIGEN3_USE_FILE} )