Skip to content

ENH: GDCM skip find_package when *_LIBRARIES pre-set #6502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blowekamp wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −14
Open

ENH: GDCM skip find_package when *_LIBRARIES pre-set #6502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 5 additions & 13 deletions Modules/ThirdParty/GDCM/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,17 @@ set(GDCM_BUILD_TESTING_DEFAULT OFF)
#
# Expat:
set(GDCM_USE_SYSTEM_EXPAT ON CACHE INTERNAL "")
set(EXPAT_INCLUDE_DIR ${ITKExpat_INCLUDE_DIRS})
set(EXPAT_LIBRARY ${ITKExpat_LIBRARIES})
set(EXPAT_LIBRARIES ${ITKExpat_LIBRARIES})
set(EXPAT_INCLUDE_DIRS "")
set(EXPAT_LIBRARIES "ITK::ITKExpatModule")
# OpenJPEG:
set(GDCM_USE_SYSTEM_OPENJPEG ON CACHE INTERNAL "")
set(GDCM_USE_OPENJPEG_V2 ON CACHE INTERNAL "")
set(OPENJPEG_INCLUDE_DIRS "")
set(OPENJPEG_LIBRARIES "ITK::ITKOpenJPEGModule")
# ZLIB:
set(GDCM_USE_SYSTEM_ZLIB ON CACHE INTERNAL "")
set(ZLIB_INCLUDE_DIR ${ITKZLIB_INCLUDE_DIRS})
set(ZLIB_INCLUDE_DIRS ${ITKZLIB_INCLUDE_DIRS})
set(ZLIB_LIBRARY ${ITKZLIB_LIBRARIES})
set(ZLIB_LIBRARIES ${ITKZLIB_LIBRARIES})
set(ZLIB_INCLUDE_DIRS "")
set(ZLIB_LIBRARIES "ITK::ITKZLIBModule")

# Configure GDCM privately so its options do not appear to the user.
set(GDCM_LEGACY_REMOVE OFF CACHE INTERNAL "Remove all legacy code completely.")
Expand Down Expand Up @@ -73,12 +70,7 @@ set(GDCM_USE_SYSTEM_LJPEG OFF CACHE INTERNAL "Use system ljpeg (ijg lib)")
# Use ITK's libjpeg-turbo as the JPEG backend instead of GDCM's IJG 6b
set(GDCM_USE_JPEGTURBO ON CACHE INTERNAL "Use libjpeg-turbo for JPEG codec")
if(GDCM_USE_JPEGTURBO)
set(
GDCM_JPEGTURBO_INCLUDE_DIRS
${ITKJPEG_INCLUDE_DIRS}
${ITKJPEG_SYSTEM_INCLUDE_DIRS}
)
set(GDCM_JPEGTURBO_LIBRARIES ${ITKJPEG_LIBRARIES})
set(GDCM_JPEGTURBO_LIBRARIES ITK::ITKJPEGModule)
endif()
set(GDCM_USE_SYSTEM_OPENSSL OFF CACHE INTERNAL "Use system OpenSSL")
set(GDCM_USE_SYSTEM_PODOFO OFF CACHE INTERNAL "Use system podofo (pdf)")
Expand Down
4 changes: 3 additions & 1 deletion Modules/ThirdParty/GDCM/src/gdcm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,9 @@ option(GDCM_USE_SYSTEM_OPENJPEG "Use system openjpeg" OFF)
option(GDCM_USE_SYSTEM_CHARLS "Use system charls" OFF)

if(GDCM_USE_SYSTEM_OPENJPEG)
#find_package(OpenJPEG REQUIRED)
if (NOT OPENJPEG_LIBRARIES)
find_package(OpenJPEG REQUIRED)
endif()
set(GDCM_OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARIES})
else()
set(GDCM_OPENJPEG_LIBRARIES gdcmopenjp2)
Expand Down
Loading