Commit c025ef6a authored by Kitware Robot's avatar Kitware Robot Committed by Ben Boeckel
Browse files

tiff 2016-07-13 (e6e45b2f)

Code extracted from:

    https://gitlab.kitware.com/third-party/tiff.git

at commit e6e45b2ff43df8d5e90d6b2249197b9c3e4b8f07 (for/vtk).
parent 3065a031
......@@ -690,11 +690,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libtiff-4.pc
DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
endif ()
# XXX(kitware): force vtk settings
set(CMAKE_INSTALL_FULL_INCLUDEDIR "${VTK_INSTALL_INCLUDE_DIR}/vtktiff")
set(ZLIB_LIBRARIES vtkzlib)
set(JPEG_LIBRARIES vtkjpeg)
# Includes used by libtiff (and tests)
if(ZLIB_INCLUDE_DIRS)
list(APPEND TIFF_INCLUDES ${ZLIB_INCLUDE_DIRS})
......
......@@ -126,7 +126,6 @@ endif ()
vtk_add_library(vtktiff ${tiff_SOURCES} ${tiff_HEADERS} ${nodist_tiff_HEADERS}
${tiff_port_SOURCES} ${tiff_DEFS})
target_link_libraries(vtktiff ${TIFF_LIBRARY_DEPS})
set_target_properties(vtktiff PROPERTIES SOVERSION ${SO_COMPATVERSION})
if(NOT CYGWIN)
# This property causes shared libraries on Linux to have the full version
# encoded into their final filename. We disable this on Cygwin because
......@@ -135,7 +134,6 @@ if(NOT CYGWIN)
if (FALSE) # XXX(kitware): mangle library name
set_target_properties(tiff PROPERTIES VERSION ${SO_VERSION})
endif ()
set_target_properties(vtktiff PROPERTIES VERSION ${SO_VERSION})
endif()
if(HAVE_LD_VERSION_SCRIPT)
if (FALSE) # XXX(kitware): mangle library name
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment