Some cmake scripts for demos and examples fixed

This commit is contained in:
Fernando Cacciola 2008-02-07 14:58:33 +00:00
parent be51013397
commit 279eb55b13
6 changed files with 8 additions and 16 deletions

View File

@ -14,24 +14,24 @@ if ( CGAL_FOUND AND QT_FOUND )
include(UseCGAL) include(UseCGAL)
include(Qt3Macros) 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 # Make sure the compiler can find generated .moc files
include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
include_directories( ${QT_INCLUDE_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_executable ( demo demo.cpp Qt_widget_get_arc.cpp Qt_widget_get_segment.cpp)
add_dependencies(demo_viewer CGAL CGAL_QT) add_dependencies( demo CGAL CGAL_QT)
if ( CGAL_USE_CGAL_CORE ) if ( CGAL_USE_CGAL_CORE )
add_dependencies(demo_viewer CGAL_CORE) add_dependencies(demo CGAL_CORE)
endif() endif()
# Link the executable to CGAL and third-party libraries # Link the executable to CGAL and third-party libraries
if ( AUTO_LINK_ENABLED ) 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() 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()
endif() endif()

View File

@ -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_arc.cpp )
create_single_source_cgal_program( Circular_kernel_arrangement_Line_Circular.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( 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() endif()

View File

@ -13,6 +13,5 @@ if ( CGAL_FOUND )
include(CreateSingleSourceCGALProgram) include(CreateSingleSourceCGALProgram)
create_single_source_cgal_program( Filtered_predicate.cpp ) create_single_source_cgal_program( Filtered_predicate.cpp )
create_single_source_cgal_program( lazykernel.cpp )
endif() endif()

View File

@ -14,14 +14,14 @@ if ( CGAL_FOUND AND QT_FOUND )
include(UseCGAL) include(UseCGAL)
include(Qt3Macros) 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 # Make sure the compiler can find generated .moc files
include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR}) include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
include_directories( ${QT_INCLUDE_DIR} ) include_directories( ${QT_INCLUDE_DIR} )
include_directories (BEFORE include) 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) add_dependencies(visualization CGAL CGAL_QT)
if ( CGAL_USE_CGAL_CORE ) if ( CGAL_USE_CGAL_CORE )

View File

@ -14,13 +14,10 @@ if ( CGAL_FOUND )
include_directories (BEFORE include) 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_pdb_reader.cpp )
create_single_source_cgal_program( skin_surface_simple.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.cpp )
create_single_source_cgal_program( skin_surface_subdiv_with_normals.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_simple.cpp )
create_single_source_cgal_program( union_of_balls_subdiv.cpp ) create_single_source_cgal_program( union_of_balls_subdiv.cpp )

View File

@ -14,6 +14,5 @@ if ( CGAL_FOUND )
create_single_source_cgal_program( mesh_a_3d_gray_image.cpp ) 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( mesh_an_implicit_function.cpp )
create_single_source_cgal_program( polyhedron_remesher.cpp )
endif() endif()