[poppler] Branch 'poppler-0.12' - CMakeLists.txt glib/CMakeLists.txt poppler-cairo.pc.cmake poppler-glib.pc.cmake poppler.pc.cmake poppler-qt4.pc.cmake poppler-qt.pc.cmake poppler-splash.pc.cmake qt4/src qt/CMakeLists.txt
Pino Toscano
pino at kemper.freedesktop.org
Sat Oct 17 00:32:58 PDT 2009
CMakeLists.txt | 16 +++++++++-------
glib/CMakeLists.txt | 2 +-
poppler-cairo.pc.cmake | 2 +-
poppler-glib.pc.cmake | 2 +-
poppler-qt.pc.cmake | 2 +-
poppler-qt4.pc.cmake | 2 +-
poppler-splash.pc.cmake | 2 +-
poppler.pc.cmake | 2 +-
qt/CMakeLists.txt | 2 +-
qt4/src/CMakeLists.txt | 2 +-
10 files changed, 18 insertions(+), 16 deletions(-)
New commits:
commit 55e7692501646aab5075974b8a49b51fb248cac1
Author: Michael Jansen <kde at michael-jansen.biz>
Date: Sat Oct 17 01:30:40 2009 +0200
CMake: add the possibility to pass LIB_SUFFIX.
This allows to tune the installation libdir by adding a suffix for it
(making it eg lib, lib32, or lib64)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31df730..9b60df2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,6 +30,8 @@ option(ENABLE_ZLIB "TODO" OFF)
option(USE_EXCEPTIONS "Throw exceptions to deal with not enough memory and similar problems." OFF)
option(USE_FIXEDPOINT "Use fixed point arithmetic" OFF)
+set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
+
# Enable these unconditionally.
set(MULTITHREAD ON)
set(OPI_SUPPORT ON)
@@ -274,7 +276,7 @@ target_link_libraries(poppler ${poppler_LIBS} ${PNG_LIBRARIES})
else (ENABLE_LIBPNG)
target_link_libraries(poppler ${poppler_LIBS})
endif (ENABLE_LIBPNG)
-install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
if(ENABLE_XPDF_HEADERS)
install(FILES
@@ -429,21 +431,21 @@ else(PKG_CONFIG_VERSION_0_18)
set(PC_REQUIRES_PRIVATE "")
endif(PKG_CONFIG_VERSION_0_18)
-poppler_create_install_pkgconfig(poppler.pc lib/pkgconfig)
+poppler_create_install_pkgconfig(poppler.pc lib${LIB_SUFFIX}/pkgconfig)
if(ENABLE_SPLASH)
- poppler_create_install_pkgconfig(poppler-splash.pc lib/pkgconfig)
+ poppler_create_install_pkgconfig(poppler-splash.pc lib${LIB_SUFFIX}/pkgconfig)
endif(ENABLE_SPLASH)
if(QT3_FOUND)
- poppler_create_install_pkgconfig(poppler-qt.pc lib/pkgconfig)
+ poppler_create_install_pkgconfig(poppler-qt.pc lib${LIB_SUFFIX}/pkgconfig)
endif(QT3_FOUND)
if(QT4_FOUND)
- poppler_create_install_pkgconfig(poppler-qt4.pc lib/pkgconfig)
+ poppler_create_install_pkgconfig(poppler-qt4.pc lib${LIB_SUFFIX}/pkgconfig)
endif(QT4_FOUND)
if(GLIB_FOUND)
- poppler_create_install_pkgconfig(poppler-glib.pc lib/pkgconfig)
+ poppler_create_install_pkgconfig(poppler-glib.pc lib${LIB_SUFFIX}/pkgconfig)
endif(GLIB_FOUND)
if(CAIRO_FOUND)
- poppler_create_install_pkgconfig(poppler-cairo.pc lib/pkgconfig)
+ poppler_create_install_pkgconfig(poppler-cairo.pc lib${LIB_SUFFIX}/pkgconfig)
endif(CAIRO_FOUND)
diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
index 2cb207b..6ed9523 100644
--- a/glib/CMakeLists.txt
+++ b/glib/CMakeLists.txt
@@ -98,7 +98,7 @@ target_link_libraries(poppler-glib poppler ${GLIB2_LIBRARIES})
if (CAIRO_FOUND)
target_link_libraries(poppler-glib ${CAIRO_LIBRARIES})
endif (CAIRO_FOUND)
-install(TARGETS poppler-glib RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+install(TARGETS poppler-glib RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
install(FILES
${poppler_glib_public_headers}
diff --git a/poppler-cairo.pc.cmake b/poppler-cairo.pc.cmake
index d62eb91..b32f118 100644
--- a/poppler-cairo.pc.cmake
+++ b/poppler-cairo.pc.cmake
@@ -1,6 +1,6 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/lib at LIB_SUFFIX@
includedir=${prefix}/include
Name: poppler-cairo
diff --git a/poppler-glib.pc.cmake b/poppler-glib.pc.cmake
index 6568f7a..5d06bab 100644
--- a/poppler-glib.pc.cmake
+++ b/poppler-glib.pc.cmake
@@ -1,6 +1,6 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/lib at LIB_SUFFIX@
includedir=${prefix}/include
Name: poppler-glib
diff --git a/poppler-qt.pc.cmake b/poppler-qt.pc.cmake
index 66115c4..a01c03e 100644
--- a/poppler-qt.pc.cmake
+++ b/poppler-qt.pc.cmake
@@ -1,6 +1,6 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/lib at LIB_SUFFIX@
includedir=${prefix}/include
Name: poppler-qt
diff --git a/poppler-qt4.pc.cmake b/poppler-qt4.pc.cmake
index 44c76bc..b17fd5d 100644
--- a/poppler-qt4.pc.cmake
+++ b/poppler-qt4.pc.cmake
@@ -1,6 +1,6 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/lib at LIB_SUFFIX@
includedir=${prefix}/include
Name: poppler-qt4
diff --git a/poppler-splash.pc.cmake b/poppler-splash.pc.cmake
index 375b73a..cb95b3d 100644
--- a/poppler-splash.pc.cmake
+++ b/poppler-splash.pc.cmake
@@ -1,6 +1,6 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/lib at LIB_SUFFIX@
includedir=${prefix}/include
Name: poppler-splash
diff --git a/poppler.pc.cmake b/poppler.pc.cmake
index dc8fcaf..f1aebed 100644
--- a/poppler.pc.cmake
+++ b/poppler.pc.cmake
@@ -1,6 +1,6 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/lib at LIB_SUFFIX@
includedir=${prefix}/include
Name: poppler
diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt
index b97089b..7f4d233 100644
--- a/qt/CMakeLists.txt
+++ b/qt/CMakeLists.txt
@@ -16,7 +16,7 @@ set(poppler_qt_SRCS
add_library(poppler-qt SHARED ${poppler_qt_SRCS})
set_target_properties(poppler-qt PROPERTIES VERSION 2.0.0 SOVERSION 2)
target_link_libraries(poppler-qt poppler ${QT3_LIBRARIES})
-install(TARGETS poppler-qt RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+install(TARGETS poppler-qt RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
install(FILES
poppler-qt.h
diff --git a/qt4/src/CMakeLists.txt b/qt4/src/CMakeLists.txt
index 59e5083..f6c7b16 100644
--- a/qt4/src/CMakeLists.txt
+++ b/qt4/src/CMakeLists.txt
@@ -38,7 +38,7 @@ target_link_libraries(poppler-qt4 poppler ${QT4_QTCORE_LIBRARY} ${QT4_QTGUI_LIBR
if(MSVC)
target_link_libraries(poppler-qt4 poppler ${poppler_LIBS})
endif(MSVC)
-install(TARGETS poppler-qt4 RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
+install(TARGETS poppler-qt4 RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
install(FILES
poppler-qt4.h
More information about the poppler
mailing list