CMakeLists.txt | 3 +-- utils/CMakeLists.txt | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-)
New commits: commit 6307b5c229d11690b8ed9d11bdaec48cb470c51e Author: Albert Astals Cid <aa...@kde.org> Date: Sun Aug 2 20:25:13 2020 +0200 cmake: Remove stray support for lcms1 in pdftocairo diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt index 3017365b..b20e744f 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt @@ -39,9 +39,6 @@ if (HAVE_CAIRO) add_definitions(${CAIRO_CFLAGS}) add_executable(pdftocairo ${pdftocairo_SOURCES}) target_link_libraries(pdftocairo ${CAIRO_LIBRARIES} ${FREETYPE_LIBRARIES} ${common_libs}) - if(LCMS_FOUND) - target_link_libraries(pdftocairo ${LCMS_LIBRARIES}) - endif() if(CMAKE_USE_PTHREADS_INIT) target_link_libraries(pdftocairo Threads::Threads) endif() commit 446baf49e696001305ed2d3e57c157862a780370 Author: Albert Astals Cid <aa...@kde.org> Date: Sun Aug 2 20:22:57 2020 +0200 cmake: Modern way to link against libtiff diff --git a/CMakeLists.txt b/CMakeLists.txt index 68c00149..89fa15f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -282,7 +282,6 @@ if(PNG_FOUND) set(ENABLE_LIBPNG ON) endif() if(TIFF_FOUND) - include_directories(SYSTEM ${TIFF_INCLUDE_DIR}) set(ENABLE_LIBTIFF ON) endif() if(OpenJPEG_FOUND) @@ -503,7 +502,7 @@ if(PNG_FOUND) set(poppler_LIBS ${poppler_LIBS} PNG::PNG) endif() if(TIFF_FOUND) - set(poppler_LIBS ${poppler_LIBS} ${TIFF_LIBRARIES}) + set(poppler_LIBS ${poppler_LIBS} TIFF::TIFF) endif() if (GPERF AND RUN_GPERF_IF_PRESENT) _______________________________________________ poppler mailing list poppler@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/poppler