blob: 08b194ceae3123c6b92cc3e0829a5ae60df67309 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
diff -ruN poppler-0.20.0/CMakeLists.txt my/CMakeLists.txt
--- poppler-0.20.0/CMakeLists.txt 2012-05-10 21:08:51.000000000 +0200
+++ my/CMakeLists.txt 2012-05-18 01:14:34.103419581 +0200
@@ -29,6 +29,7 @@
option(ENABLE_CPP "Compile poppler cpp wrapper." ON)
option(ENABLE_LIBOPENJPEG "Use libopenjpeg for JPX streams." ON)
option(ENABLE_LCMS "Use liblcms for color management." ON)
+option(ENABLE_LCMS2 "Use liblcms2 for color management." ON)
option(ENABLE_LIBCURL "Build libcurl based HTTP support." OFF)
option(ENABLE_ZLIB "Build with zlib (not totally safe)." OFF)
option(USE_FIXEDPOINT "Use fixed point arithmetic in the Splash backend" OFF)
@@ -136,16 +137,14 @@
set(ENABLE_LIBOPENJPEG ${LIBOPENJPEG_FOUND})
set(HAVE_OPENJPEG_H ON)
endif(ENABLE_LIBOPENJPEG)
-if(ENABLE_LCMS)
+if(ENABLE_LCMS2)
find_package(LCMS2)
- if(LCMS2_FOUND)
- set(USE_CMS ${LCMS2_FOUND})
- else(LCMS2_FOUND)
- find_package(LCMS)
- set(USE_CMS ${LCMS_FOUND})
- set(USE_LCMS1 ${LCMS_FOUND})
- endif(LCMS2_FOUND)
-endif(ENABLE_LCMS)
+ set(USE_CMS ${LCMS2_FOUND})
+elseif(ENABLE_LCMS)
+ find_package(LCMS)
+ set(USE_CMS ${LCMS_FOUND})
+ set(USE_LCMS1 ${LCMS_FOUND})
+endif(ENABLE_LCMS2)
if(ENABLE_LIBCURL)
find_package(CURL)
include_directories(${CURL_INCLUDE_DIR})
|
GitWeb
