mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 16:03:23 +00:00
50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
|
From 2629af4ed00d7ca65359178203d80fb146901cdb Mon Sep 17 00:00:00 2001
|
||
|
|
From: Daniel Fullmer <danielrf12@gmail.com>
|
||
|
|
Date: Fri, 3 Jul 2020 21:00:45 -0700
|
||
|
|
Subject: [PATCH 1/2] Fix CMakeLists
|
||
|
|
|
||
|
|
---
|
||
|
|
CMakeLists.txt | 12 ++++++++----
|
||
|
|
1 file changed, 8 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index e218279..4341de9 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -57,6 +57,7 @@ endif(JPEG_FOUND)
|
||
|
|
include(FindJasper)
|
||
|
|
if(JASPER_FOUND)
|
||
|
|
set(HAVE_JASPER_LIB 1)
|
||
|
|
+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${JASPER_LIBRARY})
|
||
|
|
endif(JASPER_FOUND)
|
||
|
|
|
||
|
|
# paths from willuslib/wgs.c
|
||
|
|
@@ -71,9 +72,12 @@ else()
|
||
|
|
message(STATUS "Could NOT find ghostscript executable")
|
||
|
|
endif(GHOSTSCRIPT_EXECUTABLE)
|
||
|
|
|
||
|
|
-# willus.h
|
||
|
|
-# HAVE_GSL_LIB
|
||
|
|
-
|
||
|
|
+pkg_check_modules(GSL gsl)
|
||
|
|
+if(GSL_FOUND)
|
||
|
|
+ set(HAVE_GSL_LIB 1)
|
||
|
|
+ include_directories(SYSTEM ${GSL_INCLUDEDIR})
|
||
|
|
+ set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${GSL_LDFLAGS})
|
||
|
|
+endif(GSL_FOUND)
|
||
|
|
|
||
|
|
# libfreetype6 (>= 2.3.9), libjbig2dec0, libjpeg8 (>= 8c), libx11-6, libxext6, zlib1g (>= 1:1.2.0)
|
||
|
|
# MUPDF_STATIC_LDFLAGS misses mupdf-js-none, and doubles libs ...
|
||
|
|
@@ -85,7 +89,7 @@ if(MUPDF_FOUND)
|
||
|
|
include_directories(SYSTEM ${MUPDF_INCLUDEDIR})
|
||
|
|
message(STATUS "mupdf libraries: ${MUPDF_LDFLAGS}")
|
||
|
|
set(K2PDFOPT_LIB ${K2PDFOPT_LIB} ${MUPDF_LDFLAGS}
|
||
|
|
- -lmupdf-js-none -lopenjpeg -ljbig2dec -ljpeg -lfreetype
|
||
|
|
+
|
||
|
|
)
|
||
|
|
endif(MUPDF_FOUND)
|
||
|
|
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|