Skip to content

Commit

Permalink
Fix find_package() library variables for libtiff.
Browse files Browse the repository at this point in the history
The detection of libtiff and its related JPEG support now uses the
correct CMake variables set by the corresponding find_package() scripts.

Old and obsolete values were: TIFF_LIBRARY and JPEG_LIBRARY.
New values are: TIFF_LIBRARIES and JPEG_LIBRARIES.

Thanks to "sameeul" (Sameeul Bashir Samee) for the report and patch.
  • Loading branch information
michaelonken committed Feb 13, 2024
1 parent bf0d3b8 commit a92b79c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions CMake/3rdparty.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ if(DCMTK_USE_FIND_PACKAGE)
if(NOT JPEG_FOUND)
message(STATUS "Info: DCMTK TIFF support will be enabled (but without JPEG)")
include_directories(${TIFF_INCLUDE_DIR})
set(LIBTIFF_LIBS ${TIFF_LIBRARY} ${TIFF_EXTRA_LIBS_STATIC})
set(LIBTIFF_LIBS ${TIFF_LIBRARIES} ${TIFF_EXTRA_LIBS_STATIC})
else()
message(STATUS "Info: DCMTK TIFF support will be enabled")
include_directories(${TIFF_INCLUDE_DIR} ${JPEG_INCLUDE_DIR})
set(LIBTIFF_LIBS ${TIFF_LIBRARY} ${TIFF_EXTRA_LIBS_STATIC} ${JPEG_LIBRARY})
set(LIBTIFF_LIBS ${TIFF_LIBRARIES} ${TIFF_EXTRA_LIBS_STATIC} ${JPEG_LIBRARIES})
endif()
endif()
endif()
Expand Down

0 comments on commit a92b79c

Please sign in to comment.