[poppler] 5 commits - CMakeLists.txt config.h.cmake

[Pino Toscano]

 CMakeLists.txt |   10 ++++++++++
 config.h.cmake |   28 +++++++++++++++++++++-------
 2 files changed, 31 insertions(+), 7 deletions(-)

New commits:
commit 582b5259b3c65ee1bef99dbdfccf00f37269b76f
Author: Pino Toscano <pino at kde.org>
Date:   Tue Feb 16 16:36:24 2010 +0100

    [CMake] find the system threads, and define in the config.h if we have pthreads

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ca4aeb..9e9811e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,7 @@ include(MacroOptionalFindPackage)
 find_package(PkgConfig)
 include(MacroEnsureVersion)
 include(MacroBoolTo01)
+find_package(Threads)
 
 set(POPPLER_MAJOR_VERSION "0")
 set(POPPLER_MINOR_VERSION "13")
@@ -106,6 +107,9 @@ include_directories(
   ${FREETYPE_INCLUDE_DIRS}
 )
 set(HAVE_FREETYPE_H ON)
+if(CMAKE_USE_PTHREADS_INIT)
+  set(HAVE_PTHREAD ON)
+endif(CMAKE_USE_PTHREADS_INIT)
 
 if(ENABLE_ZLIB)
   include_directories(${ZLIB_INCLUDE_DIR})
diff --git a/config.h.cmake b/config.h.cmake
index 67862ba..0d1e434 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -79,6 +79,9 @@
 /* Define to 1 if you have the `popen' function. */
 #cmakedefine HAVE_POPEN 1
 
+/* Define if you have POSIX threads libraries and header files. */
+#cmakedefine HAVE_PTHREAD 1
+
 /* Use splash for rendering. */
 #cmakedefine HAVE_SPLASH 1
 
commit 1dff9d440556a155fb5ca7bed15fc6a1f77a1c97
Author: Pino Toscano <pino at kde.org>
Date:   Tue Feb 16 16:10:44 2010 +0100

    [CMake] add the HAVE_LIBOPENJPEG and HAVE_OPENJPEG_H defines, to match autotools' ones

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7fece6..9ca4aeb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,6 +88,7 @@ endif(ENABLE_ABIWORD)
 if(ENABLE_LIBOPENJPEG)
   find_package(LIBOPENJPEG)
   set(ENABLE_LIBOPENJPEG ${LIBOPENJPEG_FOUND})
+  set(HAVE_OPENJPEG_H ON)
 endif(ENABLE_LIBOPENJPEG)
 if(ENABLE_LCMS)
   find_package(LCMS)
diff --git a/config.h.cmake b/config.h.cmake
index 9f33d73..67862ba 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -52,6 +52,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #cmakedefine HAVE_INTTYPES_H 1
 
+/* Define to 1 if you have the `openjpeg' library (-lopenjpeg). */
+#cmakedefine HAVE_LIBOPENJPEG 1
+
 /* Define to 1 if you have the `z' library (-lz). */
 #cmakedefine HAVE_LIBZ 1
 
@@ -70,6 +73,9 @@
 /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
 #cmakedefine HAVE_NDIR_H 1
 
+/* Define to 1 if you have the <openjpeg.h> header file. */
+#cmakedefine HAVE_OPENJPEG_H 1
+
 /* Define to 1 if you have the `popen' function. */
 #cmakedefine HAVE_POPEN 1
 
commit 4a0bcaa83e6e6533cd48c63449a08467d51c13ea
Author: Pino Toscano <pino at kde.org>
Date:   Tue Feb 16 16:01:53 2010 +0100

    [CMake] config.h.cmake: change some comments to match autotools' ones

diff --git a/config.h.cmake b/config.h.cmake
index 6792eff..9f33d73 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -88,13 +88,15 @@
 /* Define to 1 if you have the <string.h> header file. */
 #cmakedefine HAVE_STRING_H 1
 
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. */
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
 #cmakedefine HAVE_SYS_DIR_H 1
 
 /* Define to 1 if you have the <sys/mman.h> header file. */
 #cmakedefine HAVE_SYS_MMAN_H 1
 
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. */
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
 #cmakedefine HAVE_SYS_NDIR_H 1
 
 /* Define to 1 if you have the <sys/stat.h> header file. */
@@ -154,10 +156,10 @@
 /* Throw exceptions to deal with not enough memory and similar problems */
 #cmakedefine USE_EXCEPTIONS 1
 
-/* Use fixed point arithmetic in the Splash backend */
+/* Use fixed point arithmetic */
 #cmakedefine USE_FIXEDPOINT 1
 
-/* Use single precision arithmetic in the Splash backend */
+/* Use single precision arithmetic */
 #cmakedefine USE_FLOAT 1
 
 /* Version number of package */
commit 9e38082c3e571d035f0152d65661e5dd97fdd5d8
Author: Pino Toscano <pino at kde.org>
Date:   Tue Feb 16 15:58:30 2010 +0100

    [CMake] add the Win32-specific ENABLE_RELOCATABLE option, matching autotools' one

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8d9f35a..a7fece6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,11 @@ else(MSVC)
   option(WITH_FONTCONFIGURATION_WIN32 "Select win32 font configuration backend" OFF)
   option(WITH_FONTCONFIGURATION_FONTCONFIG "Select fontconfig font configuration backend" ON)
 endif(MSVC)
+if(WIN32)
+  option(ENABLE_RELOCATABLE "Hardcode the poppler library location (on Windows)." ON)
+else(WIN32)
+  set(ENABLE_RELOCATABLE OFF)
+endif(WIN32)
 
 set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
 
diff --git a/config.h.cmake b/config.h.cmake
index 46b5d65..6792eff 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -12,6 +12,9 @@
 /* Build against libpng. */
 #cmakedefine ENABLE_LIBPNG 1
 
+/* Do not hardcode the library location */
+#cmakedefine ENABLE_RELOCATABLE 1
+
 /* Use zlib instead of builtin zlib decoder. */
 #cmakedefine ENABLE_ZLIB 1
 
commit eb03020893ed591c18817d75d427a1296cb1f233
Author: Pino Toscano <pino at kde.org>
Date:   Tue Feb 16 15:49:50 2010 +0100

    [CMake] config.h.cmake: move POPPLER_WITH_GDK in the same place of autotools' generated one, and with the same comment

diff --git a/config.h.cmake b/config.h.cmake
index 9527fd5..46b5d65 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -106,9 +106,6 @@
 /* Define to 1 if you have the <zlib.h> header file. */
 #cmakedefine HAVE_ZLIB_H 1
 
-/* Define to 1 if gdk was found */
-#cmakedefine POPPLER_WITH_GDK 1
-
 /* Enable multithreading support. */
 #cmakedefine MULTITHREADED 1
 
@@ -139,6 +136,9 @@
 /* Poppler data dir */
 #define POPPLER_DATADIR "${CMAKE_INSTALL_PREFIX}/share/poppler"
 
+/* Have GDK */
+#cmakedefine POPPLER_WITH_GDK 1
+
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1