More link with zlib

This commit is contained in:
Guillaume Damiand 2016-06-18 07:59:35 +02:00
parent d0d90d2d7a
commit 374f5cc785
4 changed files with 26 additions and 10 deletions

View File

@ -14,6 +14,10 @@ include( CGAL_CreateSingleSourceCGALProgram )
if(CGAL_ImageIO_FOUND) if(CGAL_ImageIO_FOUND)
create_single_source_cgal_program( "convert_raw_image_to_inr.cpp" ) create_single_source_cgal_program( "convert_raw_image_to_inr.cpp" )
create_single_source_cgal_program( "test_imageio.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() else()
message(STATUS "NOTICE: This demo needs the CGAL ImageIO library, and will not be compiled.") message(STATUS "NOTICE: This demo needs the CGAL ImageIO library, and will not be compiled.")
endif() endif()

View File

@ -19,6 +19,9 @@ if ( CGAL_FOUND )
if (WITH_CGAL_ImageIO) if (WITH_CGAL_ImageIO)
create_single_source_cgal_program( "test_trilinear_interpolation.cpp" ) create_single_source_cgal_program( "test_trilinear_interpolation.cpp" )
if(CGAL_ImageIO_USE_ZLIB)
target_link_libraries(test_trilinear_interpolation ${ZLIB_LIBRARY})
endif()
else() else()
message(STATUS "NOTICE: Some tests require the CGAL_ImageIO library, and will not be compiled.") message(STATUS "NOTICE: Some tests require the CGAL_ImageIO library, and will not be compiled.")
endif() endif()

View File

@ -116,6 +116,10 @@ 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}) 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 ) 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.") 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 ) endif( QGLVIEWER_FOUND AND Qt5_FOUND AND OPENGL_FOUND AND OPENGL_GLU_FOUND )

View File

@ -19,6 +19,11 @@ if ( CGAL_FOUND AND CGAL_ImageIO_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" )
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() else()
if(RUNNING_CGAL_AUTO_TEST) if(RUNNING_CGAL_AUTO_TEST)
# Just to avoid a warning from CMake if that variable is set on the command line... # Just to avoid a warning from CMake if that variable is set on the command line...