CMakeLists.txt | 3 ++- qt4/src/Mainpage.dox | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-)
New commits: commit 14f9ff2b149c932b52ac88d7cd3f189e3b98257c Author: Yury G. Kudryashov <[email protected]> Date: Thu Oct 6 14:49:19 2011 +0200 Okular moved to git, fix docs Fix URLs in poppler-qt4 documentation diff --git a/qt4/src/Mainpage.dox b/qt4/src/Mainpage.dox index f5dc6ef..30398c3 100644 --- a/qt4/src/Mainpage.dox +++ b/qt4/src/Mainpage.dox @@ -15,12 +15,12 @@ The %Poppler Qt4 interface library is quite stable and working. @section refimpl Example Programs Examples programs can be found in the qt4/test directory. The %Poppler -Qt4 interface library is also used in the development version of KDE's +Qt4 interface library is also used in the KDE's document viewer <a href="http://okular.kde.org";>Okular</a>. The source files -for Okular's PDF plugin (%Poppler-based) can be found on the subversion server +for Okular's PDF plugin (%Poppler-based) can be found on the git server of the KDE project, under <a -href="http://websvn.kde.org/trunk/KDE/kdegraphics/okular/generators/poppler";>this +href="http://quickgit.kde.org/?p=okular.git&a=tree&f=generators/poppler";>this URL</a>. commit d0e4ba50d101c165106e0dc3b08249dba2ea0465 Author: Yury G. Kudryashov <[email protected]> Date: Thu Oct 6 14:49:08 2011 +0200 Explicitly include fontconfig include dir This fixes cmake-driven build on systems where fontconfig is installed in non-standard location. diff --git a/CMakeLists.txt b/CMakeLists.txt index 13fc3a3..552c285 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,6 +131,7 @@ endif(ENABLE_LIBCURL) add_definitions(-DHAVE_CONFIG_H=1) if(FONTCONFIG_FOUND) add_definitions(${FONTCONFIG_DEFINITIONS}) + include_directories(${FONTCONFIG_INCLUDE_DIR}) endif(FONTCONFIG_FOUND) if(WITH_FONTCONFIGURATION_WIN32) if(MINGW) commit 17ac6b96aa99213f85006a37d10c927fe2e3f06d Author: Yury G. Kudryashov <[email protected]> Date: Thu Oct 6 14:48:46 2011 +0200 Fix typo in cmake option documentation Relocatable build does *not* (was missing in docs) hardcode library location. diff --git a/CMakeLists.txt b/CMakeLists.txt index 499ff23..13fc3a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,7 +34,7 @@ option(ENABLE_ZLIB "Build with zlib (not totally safe)." OFF) option(USE_FIXEDPOINT "Use fixed point arithmetic in the Splash backend" OFF) option(USE_FLOAT "Use single precision arithmetic in the Splash backend" OFF) if(WIN32) - option(ENABLE_RELOCATABLE "Hardcode the poppler library location (on Windows)." ON) + option(ENABLE_RELOCATABLE "Do not hardcode the poppler library location (on Windows)." ON) else(WIN32) set(ENABLE_RELOCATABLE OFF) endif(WIN32) _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
