mirror of https://github.com/CGAL/cgal
Remove link with zlib (that we introduced before but which are no more required)
This commit is contained in:
parent
10cadcb985
commit
e02ac7f7f0
|
|
@ -14,10 +14,6 @@ include( CGAL_CreateSingleSourceCGALProgram )
|
|||
if(CGAL_ImageIO_FOUND)
|
||||
create_single_source_cgal_program( "convert_raw_image_to_inr.cpp" )
|
||||
create_single_source_cgal_program( "test_imageio.cpp" )
|
||||
if(CGAL_ImageIO_USE_ZLIB)
|
||||
target_link_libraries(convert_raw_image_to_inr ${ZLIB_LIBRARY})
|
||||
target_link_libraries(test_imageio ${ZLIB_LIBRARY})
|
||||
endif()
|
||||
else()
|
||||
message(STATUS "NOTICE: This demo needs the CGAL ImageIO library, and will not be compiled.")
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -19,9 +19,6 @@ if ( CGAL_FOUND )
|
|||
|
||||
if (WITH_CGAL_ImageIO)
|
||||
create_single_source_cgal_program( "test_trilinear_interpolation.cpp" )
|
||||
if(CGAL_ImageIO_USE_ZLIB)
|
||||
target_link_libraries(test_trilinear_interpolation ${ZLIB_LIBRARY})
|
||||
endif()
|
||||
else()
|
||||
message(STATUS "NOTICE: Some tests require the CGAL_ImageIO library, and will not be compiled.")
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ if ( CGAL_FOUND )
|
|||
create_single_source_cgal_program( "mesh_implicit_domains.cpp" "../examples/Mesh_3/implicit_functions.cpp" )
|
||||
if( CGAL_ImageIO_USE_ZLIB )
|
||||
create_single_source_cgal_program( "mesh_3D_image.cpp" )
|
||||
target_link_libraries(mesh_3D_image ${ZLIB_LIBRARY})
|
||||
else()
|
||||
message( STATUS "NOTICE: The example mesh_3D_image.cpp needs CGAL_ImageIO to be configured with ZLIB support, and will not be compiled." )
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -39,10 +39,7 @@ if ( CGAL_FOUND )
|
|||
create_single_source_cgal_program( "test_mesh_criteria_creation.cpp" )
|
||||
if(CGAL_ImageIO_USE_ZLIB)
|
||||
create_single_source_cgal_program( "test_meshing_3D_image.cpp" )
|
||||
target_link_libraries(test_meshing_3D_image ${ZLIB_LIBRARY})
|
||||
|
||||
create_single_source_cgal_program( "test_meshing_3D_gray_image.cpp" )
|
||||
target_link_libraries(test_meshing_3D_gray_image ${ZLIB_LIBRARY})
|
||||
else()
|
||||
message(STATUS "test_meshing_3D_image requires the ZLIB library, and will not be compiled.")
|
||||
endif()
|
||||
|
|
|
|||
|
|
@ -217,11 +217,7 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND QGLVIEWER_FOUND)
|
|||
target_link_libraries(scene_c3t3_item scene_polyhedron_item scene_polygon_soup_item scene_basic_objects ${TBB_LIBRARIES})
|
||||
add_item(scene_polyhedron_item Scene_polyhedron_item.cpp)
|
||||
add_item(scene_polyhedron_transform_item Plugins/PCA/Scene_polyhedron_transform_item.cpp )
|
||||
|
||||
add_item(scene_image_item Scene_image_item.cpp)
|
||||
if( WITH_CGAL_ImageIO AND CGAL_ImageIO_USE_ZLIB )
|
||||
target_link_libraries( scene_image_item ${ZLIB_LIBRARY})
|
||||
endif()
|
||||
|
||||
# special
|
||||
target_link_libraries(scene_polyhedron_transform_item scene_polyhedron_item)
|
||||
|
|
|
|||
|
|
@ -116,10 +116,6 @@ if ( CGAL_FOUND AND CGAL_Qt5_FOUND AND CGAL_ImageIO_FOUND)
|
|||
|
||||
target_link_libraries( ${prj} ${QT_LIBRARIES} ${QGLVIEWER_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${VTK_LIBS})
|
||||
|
||||
if(CGAL_ImageIO_USE_ZLIB)
|
||||
target_link_libraries(${prj} ${ZLIB_LIBRARY})
|
||||
endif()
|
||||
|
||||
else( QGLVIEWER_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND OPENGL_GLU_FOUND )
|
||||
message(STATUS "NOTICE: This demo needs libQGLViewer, and will not be compiled.")
|
||||
endif( QGLVIEWER_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND OPENGL_GLU_FOUND )
|
||||
|
|
|
|||
|
|
@ -19,11 +19,6 @@ if ( CGAL_FOUND AND CGAL_ImageIO_FOUND )
|
|||
create_single_source_cgal_program( "mesh_a_3d_gray_image.cpp" )
|
||||
create_single_source_cgal_program( "mesh_an_implicit_function.cpp" )
|
||||
|
||||
if(CGAL_ImageIO_USE_ZLIB)
|
||||
target_link_libraries(mesh_a_3d_gray_image ${ZLIB_LIBRARY})
|
||||
target_link_libraries(mesh_an_implicit_function ${ZLIB_LIBRARY})
|
||||
endif()
|
||||
|
||||
else()
|
||||
if(RUNNING_CGAL_AUTO_TEST)
|
||||
# Just to avoid a warning from CMake if that variable is set on the command line...
|
||||
|
|
|
|||
Loading…
Reference in New Issue