CMakeLists.txt | 11 ++++++++--- cmake/modules/FindNSS3.cmake | 6 +----- 2 files changed, 9 insertions(+), 8 deletions(-)
New commits: commit 77d1660d6b6777a434a4c09f6c781999ab7ce0a8 Author: Albert Astals Cid <aa...@kde.org> Date: Sun Dec 4 02:42:15 2022 +0100 cmake: include dirs via target_include_directories instead of include_directories diff --git a/CMakeLists.txt b/CMakeLists.txt index 42dad3ea..d054a23c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -535,15 +535,12 @@ if (OpenJPEG_FOUND) poppler/JPEG2000Stream.cc ) set(poppler_LIBS ${poppler_LIBS} openjp2) - # target openjp2 may lack interface include directories - include_directories(SYSTEM ${OPENJPEG_INCLUDE_DIRS}) else () set(poppler_SRCS ${poppler_SRCS} poppler/JPXStream.cc ) endif() if(USE_CMS) - include_directories(SYSTEM ${LCMS2_INCLUDE_DIR}) set(poppler_LIBS ${poppler_LIBS} ${LCMS2_LIBRARIES}) endif() if(WIN32) @@ -603,6 +600,14 @@ if(MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS) endif() add_library(poppler ${poppler_SRCS}) +if (OpenJPEG_FOUND) + # check if we can remove this when we depend on newer openjpeg versions, 2.5 seems fixed + # target openjp2 may lack interface include directories + target_include_directories(poppler SYSTEM PRIVATE ${OPENJPEG_INCLUDE_DIRS}) +endif() +if(USE_CMS) + target_include_directories(poppler SYSTEM PRIVATE ${LCMS2_INCLUDE_DIR}) +endif() generate_export_header(poppler BASE_NAME poppler-private EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler_private_export.h") set_target_properties(poppler PROPERTIES VERSION 126.0.0 SOVERSION 126) if(MINGW AND BUILD_SHARED_LIBS) commit b1fe3a03c0bfdc4df6d8dd5d128b928d3cb2ea89 Author: Albert Astals Cid <aa...@kde.org> Date: Sun Dec 4 02:20:27 2022 +0100 cmake: nss: Fix typo and remove "deprecated" variables diff --git a/cmake/modules/FindNSS3.cmake b/cmake/modules/FindNSS3.cmake index f83ef914..6029da39 100644 --- a/cmake/modules/FindNSS3.cmake +++ b/cmake/modules/FindNSS3.cmake @@ -1,13 +1,9 @@ # - try to find NSS3 libraries # Once done this will define # -# NSS_FOUND - system has NSS3 +# NSS3_FOUND - system has NSS3 # PkgConfig::NSS3 - Use this in target_link_libraries to bring both includes and link libraries # -# Deprecated, use the above variables: -# NSS3_CFLAGS - the NSS CFlags -# NSS3_LIBRARIES - Link these to use NSS -# # Copyright 2015 André Guerreiro, <aguerreiro1...@gmail.com> # Copyright 2022 Albert Astals Cid, <aa...@kde.org> #