From 279eb55b13a4be0f65238cf60371e38b2af3d4db Mon Sep 17 00:00:00 2001 From: Fernando Cacciola Date: Thu, 7 Feb 2008 14:58:33 +0000 Subject: [PATCH] Some cmake scripts for demos and examples fixed --- .../demo/Circular_kernel_2/CMakeLists.txt | 12 ++++++------ .../examples/Circular_kernel_2/CMakeLists.txt | 3 --- .../examples/Filtered_kernel/CMakeLists.txt | 1 - Nef_S2/demo/Nef_S2/CMakeLists.txt | 4 ++-- .../examples/Skin_surface_3/CMakeLists.txt | 3 --- .../examples/Surface_mesher/CMakeLists.txt | 1 - 6 files changed, 8 insertions(+), 16 deletions(-) diff --git a/Circular_kernel_2/demo/Circular_kernel_2/CMakeLists.txt b/Circular_kernel_2/demo/Circular_kernel_2/CMakeLists.txt index 1ecf39b2fb3..4615dd217ea 100644 --- a/Circular_kernel_2/demo/Circular_kernel_2/CMakeLists.txt +++ b/Circular_kernel_2/demo/Circular_kernel_2/CMakeLists.txt @@ -14,24 +14,24 @@ if ( CGAL_FOUND AND QT_FOUND ) include(UseCGAL) include(Qt3Macros) - QT3_AUTOMOC( demo_circle.cpp demo.cpp demo_elias.cpp demo_Lazy_line_circle.cpp demo_line.cpp demo_viewer.cpp Qt_widget_get_arc.cpp Qt_widget_get_segment.cpp ) + QT3_AUTOMOC( demo.cpp Qt_widget_get_arc.cpp Qt_widget_get_segment.cpp ) # Make sure the compiler can find generated .moc files include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) include_directories( ${QT_INCLUDE_DIR} ) - add_executable (demo_viewer demo_circle.cpp demo.cpp demo_elias.cpp demo_Lazy_line_circle.cpp demo_line.cpp demo_viewer.cpp Qt_widget_get_arc.cpp Qt_widget_get_segment.cpp) - add_dependencies(demo_viewer CGAL CGAL_QT) + add_executable ( demo demo.cpp Qt_widget_get_arc.cpp Qt_widget_get_segment.cpp) + add_dependencies( demo CGAL CGAL_QT) if ( CGAL_USE_CGAL_CORE ) - add_dependencies(demo_viewer CGAL_CORE) + add_dependencies(demo CGAL_CORE) endif() # Link the executable to CGAL and third-party libraries if ( AUTO_LINK_ENABLED ) - target_link_libraries(demo_viewer ${CGAL_3RD_PARTY_LIBRARIES} ${QT_LIBRARIES} ) + target_link_libraries(demo ${CGAL_3RD_PARTY_LIBRARIES} ${QT_LIBRARIES} ) else() - target_link_libraries(demo_viewer ${CGAL_LIBRARIES} ${CGAL_QT_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ${QT_LIBRARIES}) + target_link_libraries(demo ${CGAL_LIBRARIES} ${CGAL_QT_LIBRARIES} ${CGAL_3RD_PARTY_LIBRARIES} ${QT_LIBRARIES}) endif() endif() diff --git a/Circular_kernel_2/examples/Circular_kernel_2/CMakeLists.txt b/Circular_kernel_2/examples/Circular_kernel_2/CMakeLists.txt index 87be1b3fe4e..f8795607d82 100644 --- a/Circular_kernel_2/examples/Circular_kernel_2/CMakeLists.txt +++ b/Circular_kernel_2/examples/Circular_kernel_2/CMakeLists.txt @@ -18,8 +18,5 @@ if ( CGAL_FOUND ) create_single_source_cgal_program( Circular_kernel_arrangement_Line_arc.cpp ) create_single_source_cgal_program( Circular_kernel_arrangement_Line_Circular.cpp ) create_single_source_cgal_program( Exact_circular_kernel.cpp ) - create_single_source_cgal_program( Lazy_Circular_kernel_arrangement.cpp ) - create_single_source_cgal_program( Lazy_Circular_kernel_arrangement_Line_arc.cpp ) - create_single_source_cgal_program( Lazy_Circular_kernel_arrangement_Line_Circular.cpp ) endif() diff --git a/Filtered_kernel/examples/Filtered_kernel/CMakeLists.txt b/Filtered_kernel/examples/Filtered_kernel/CMakeLists.txt index 1aab234abfc..ee2bc9a21cd 100644 --- a/Filtered_kernel/examples/Filtered_kernel/CMakeLists.txt +++ b/Filtered_kernel/examples/Filtered_kernel/CMakeLists.txt @@ -13,6 +13,5 @@ if ( CGAL_FOUND ) include(CreateSingleSourceCGALProgram) create_single_source_cgal_program( Filtered_predicate.cpp ) - create_single_source_cgal_program( lazykernel.cpp ) endif() diff --git a/Nef_S2/demo/Nef_S2/CMakeLists.txt b/Nef_S2/demo/Nef_S2/CMakeLists.txt index f8399c63c54..a6181c14b55 100644 --- a/Nef_S2/demo/Nef_S2/CMakeLists.txt +++ b/Nef_S2/demo/Nef_S2/CMakeLists.txt @@ -14,14 +14,14 @@ if ( CGAL_FOUND AND QT_FOUND ) include(UseCGAL) include(Qt3Macros) - QT3_AUTOMOC( Nef_polyhedron_S2-demo2.cpp Nef_polyhedron_S2-demo.cpp SM_overlayer-demo.cpp SM_triangulator-demo.cpp Sphere_geometry-demo.cpp visualization.cpp ) + QT3_AUTOMOC( visualization.cpp ) # Make sure the compiler can find generated .moc files include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) include_directories( ${QT_INCLUDE_DIR} ) include_directories (BEFORE include) - add_executable (visualization Nef_polyhedron_S2-demo2.cpp Nef_polyhedron_S2-demo.cpp SM_overlayer-demo.cpp SM_triangulator-demo.cpp Sphere_geometry-demo.cpp visualization.cpp) + add_executable (visualization visualization.cpp) add_dependencies(visualization CGAL CGAL_QT) if ( CGAL_USE_CGAL_CORE ) diff --git a/Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt b/Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt index 7e68583e485..48a0ca63c82 100644 --- a/Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt +++ b/Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt @@ -14,13 +14,10 @@ if ( CGAL_FOUND ) include_directories (BEFORE include) - create_single_source_cgal_program( NGHK_skin_surface_simple.cpp ) - create_single_source_cgal_program( NGHK_skin_surface_subdiv.cpp ) create_single_source_cgal_program( skin_surface_pdb_reader.cpp ) create_single_source_cgal_program( skin_surface_simple.cpp ) create_single_source_cgal_program( skin_surface_subdiv.cpp ) create_single_source_cgal_program( skin_surface_subdiv_with_normals.cpp ) - create_single_source_cgal_program( skin_surface_with_surface_mesher.cpp ) create_single_source_cgal_program( union_of_balls_simple.cpp ) create_single_source_cgal_program( union_of_balls_subdiv.cpp ) diff --git a/Surface_mesher/examples/Surface_mesher/CMakeLists.txt b/Surface_mesher/examples/Surface_mesher/CMakeLists.txt index b3612b4a651..d527b097052 100644 --- a/Surface_mesher/examples/Surface_mesher/CMakeLists.txt +++ b/Surface_mesher/examples/Surface_mesher/CMakeLists.txt @@ -14,6 +14,5 @@ if ( CGAL_FOUND ) create_single_source_cgal_program( mesh_a_3d_gray_image.cpp ) create_single_source_cgal_program( mesh_an_implicit_function.cpp ) - create_single_source_cgal_program( polyhedron_remesher.cpp ) endif()