From c25a2d89e087b470d9dbfec41d9988c104775741 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Wed, 18 May 2022 00:49:24 +0200 Subject: [PATCH] CMake: PCIDSK: fix build without JPEG (fixes #5741) --- frmts/pcidsk/CMakeLists.txt | 2 +- frmts/pcidsk/sdk/CMakeLists.txt | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/frmts/pcidsk/CMakeLists.txt b/frmts/pcidsk/CMakeLists.txt index ddda29aedafe..5eafe1d72f98 100644 --- a/frmts/pcidsk/CMakeLists.txt +++ b/frmts/pcidsk/CMakeLists.txt @@ -12,6 +12,6 @@ gdal_standard_includes(gdal_PCIDSK) target_include_directories(gdal_PCIDSK PRIVATE $) add_subdirectory(sdk) -if (NOT GDAL_USE_JPEG_INTERNAL) +if (GDAL_USE_JPEG AND NOT GDAL_USE_JPEG_INTERNAL) gdal_target_link_libraries(gdal_PCIDSK PRIVATE JPEG::JPEG) endif () diff --git a/frmts/pcidsk/sdk/CMakeLists.txt b/frmts/pcidsk/sdk/CMakeLists.txt index c58186a2addc..10fe7a9ad649 100644 --- a/frmts/pcidsk/sdk/CMakeLists.txt +++ b/frmts/pcidsk/sdk/CMakeLists.txt @@ -71,15 +71,14 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16) set_property(TARGET pcidsk_sdk PROPERTY UNITY_BUILD OFF) endif () -target_compile_definitions(pcidsk_sdk PRIVATE -DHAVE_LIBJPEG) -if (GDAL_USE_JPEG_INTERNAL) - target_include_directories(pcidsk_sdk PRIVATE $) - if (RENAME_INTERNAL_JPEG_SYMBOLS) - target_compile_definitions(pcidsk_sdk PRIVATE -DRENAME_INTERNAL_LIBJPEG_SYMBOLS) - endif () -else () - target_include_directories(pcidsk_sdk PRIVATE ${JPEG_INCLUDE_DIRS}) -endif () +if (GDAL_USE_JPEG OR GDAL_USE_JPEG_INTERNAL) + target_compile_definitions(pcidsk_sdk PRIVATE -DHAVE_LIBJPEG) + if (GDAL_USE_JPEG_INTERNAL) + gdal_add_vendored_lib(pcidsk_sdk libjpeg) + else () + target_include_directories(pcidsk_sdk PRIVATE ${JPEG_INCLUDE_DIRS}) + endif () +endif() if (NOT TARGET PCIDSK::PCIDSK) add_library(PCIDSK::PCIDSK UNKNOWN IMPORTED)