r23405 by craig - Remove extra dirs from cairo finder

scribus-commit scribus-commit at lists.scribus.net
Sun Dec 8 16:57:47 UTC 2019


Author: craig
Date: Sun Dec  8 16:57:47 2019
New Revision: 23405

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23405
Log:
Remove extra dirs from cairo finder

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

Modified: trunk/Scribus/cmake/modules/CAIROConfig.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23405&path=/trunk/Scribus/cmake/modules/CAIROConfig.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/CAIROConfig.cmake	(original)
+++ trunk/Scribus/cmake/modules/CAIROConfig.cmake	Sun Dec  8 16:57:47 2019
@@ -24,14 +24,14 @@
 
 find_path(CAIRO_INCLUDE_DIR 
   NAMES cairo.h
-  PATHS ${PREFIX_CAIRO_INCLUDE} ${PKG_CAIRO_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS} /usr/local/include /usr/include
+  PATHS ${PREFIX_CAIRO_INCLUDE} ${PKG_CAIRO_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS}
   PATH_SUFFIXES cairo
   NO_DEFAULT_PATH
 )
 
 find_library(CAIRO_LIBRARY
   NAMES libcairo cairo
-  PATHS ${PREFIX_CAIRO_LIB} ${PKG_CAIRO_LIBRARIES} ${CAIRO_LIBRARY_DIRS} /usr/local/lib /usr/lib
+  PATHS ${PREFIX_CAIRO_LIB} ${PKG_CAIRO_LIBRARIES} ${CAIRO_LIBRARY_DIRS}
   NO_DEFAULT_PATH
 )
 




More information about the scribus-commit mailing list