r17647 by jghali - #10813: Hardcoded multiarch paths in FindPOPPLER.cmake

scribus-commit scribus-commit at lists.scribus.net
Wed Jun 27 20:52:13 UTC 2012


Author: jghali
Date: Wed Jun 27 20:52:13 2012
New Revision: 17647

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17647
Log:
#10813: Hardcoded multiarch paths in FindPOPPLER.cmake

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

Modified: trunk/Scribus/cmake/modules/FindPOPPLER.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17647&path=/trunk/Scribus/cmake/modules/FindPOPPLER.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindPOPPLER.cmake (original)
+++ trunk/Scribus/cmake/modules/FindPOPPLER.cmake Wed Jun 27 20:52:13 2012
@@ -16,7 +16,7 @@
 
 FIND_LIBRARY(POPPLER_LIBRARY
   NAMES libpoppler poppler
-  PATHS ${PKG_POPPLER_LIBRARIES} ${POPPLER_LIBRARY_DIRS} /usr/local/lib /usr/lib /usr/lib/i386-linux-gnu /usr/lib/x86_64-linux-gnu
+  PATHS ${PKG_POPPLER_LIBRARIES} ${POPPLER_LIBRARY_DIRS} /usr/local/lib /usr/lib /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
   PATH_SUFFIXES poppler
   NO_DEFAULT_PATH
 )




More information about the scribus-commit mailing list