From 42887fb8136b362637db318907b78128b13c251a Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Fri, 8 Nov 2024 23:07:36 +0300 Subject: [PATCH 1/5] Minimal cmake fixes --- CMakeLists.txt | 3 +-- Pdf4QtLibCore/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b943d3f..fed05c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,6 @@ endif() qt_standard_project_setup(I18N_TRANSLATED_LANGUAGES en de cs es ko) find_package(OpenSSL REQUIRED) -find_package(lcms2 REQUIRED) find_package(ZLIB REQUIRED) find_package(Freetype REQUIRED) find_package(OpenJPEG CONFIG REQUIRED) @@ -99,7 +98,7 @@ endif() option(PDF4QT_INSTALL_TO_USR "Install to usr directory" ON) if(PDF4QT_LINUX) - set(PDF4QT_INSTALL_LIB_DIR_IMPL lib) + set(PDF4QT_INSTALL_LIB_DIR_IMPL ${CMAKE_INSTALL_LIBDIR}) set(PDF4QT_INSTALL_BIN_DIR_IMPL bin) # Check if VCPKG_OVERLAY_PORTS is set as an environment variable or a CMake argument diff --git a/Pdf4QtLibCore/CMakeLists.txt b/Pdf4QtLibCore/CMakeLists.txt index f3436e0..7c719ce 100644 --- a/Pdf4QtLibCore/CMakeLists.txt +++ b/Pdf4QtLibCore/CMakeLists.txt @@ -170,7 +170,7 @@ GENERATE_EXPORT_HEADER(Pdf4QtLibCore EXPORT_FILE_NAME "${CMAKE_BINARY_DIR}/${INSTALL_INCLUDEDIR}/pdf4qtlibcore_export.h") target_link_libraries(Pdf4QtLibCore PRIVATE Qt6::Core Qt6::Gui Qt6::Xml Qt6::Svg) -target_link_libraries(Pdf4QtLibCore PRIVATE lcms2::lcms2) +target_link_libraries(Pdf4QtLibCore PRIVATE lcms2) target_link_libraries(Pdf4QtLibCore PRIVATE OpenSSL::SSL OpenSSL::Crypto) target_link_libraries(Pdf4QtLibCore PRIVATE ZLIB::ZLIB) target_link_libraries(Pdf4QtLibCore PRIVATE Freetype::Freetype) -- 2.49.1