r17601 by craig - #10756: on debian testing (and ubuntu) fails to cmake if poppler*-dev is present

[scribus-commit]

Author: craig
Date: Thu Jun 21 21:28:17 2012
New Revision: 17601

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17601
Log:
#10756: on debian testing (and ubuntu) fails to cmake if poppler*-dev is present

Modified:
    trunk/Scribus/TODO
    trunk/Scribus/cmake/modules/FindPOPPLER.cmake

Modified: trunk/Scribus/TODO
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17601&path=/trunk/Scribus/TODO
==============================================================================
--- trunk/Scribus/TODO (original)
+++ trunk/Scribus/TODO Thu Jun 21 21:28:17 2012
@@ -1,3 +1,2 @@
 The roadmap for the next release can be seen on bugs.scribus.net website.
-
 Always lots to do.. ask if you have time to help :)

Modified: trunk/Scribus/cmake/modules/FindPOPPLER.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17601&path=/trunk/Scribus/cmake/modules/FindPOPPLER.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindPOPPLER.cmake (original)
+++ trunk/Scribus/cmake/modules/FindPOPPLER.cmake Thu Jun 21 21:28:17 2012
@@ -16,7 +16,7 @@
 
 FIND_LIBRARY(POPPLER_LIBRARY
   NAMES libpoppler poppler
-  PATHS ${PKG_POPPLER_LIBRARIES} ${POPPLER_LIBRARY_DIRS} /usr/local/lib /usr/lib
+  PATHS ${PKG_POPPLER_LIBRARIES} ${POPPLER_LIBRARY_DIRS} /usr/local/lib /usr/lib /usr/lib/x86_64-linux-gnu
   NO_DEFAULT_PATH
 )
 IF (POPPLER_LIBRARY)
@@ -25,4 +25,4 @@
     SET( POPPLER_LIBRARIES ${POPPLER_LIBRARY} )
     SET( POPPLER_INCLUDES ${POPPLER_INCLUDE_DIR})
   ENDIF (POPPLER_INCLUDE_DIR)
-ENDIF (POPPLER_LIBRARY)
+ENDIF (POPPLER_LIBRARY)