r24336 by craig - Move old Fontconfig finder to old, change poppler finder case to match pkgconfig

[scribus-commit]

Author: craig
Date: Mon Dec 21 22:15:19 2020
New Revision: 24336

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24336
Log:
Move old Fontconfig finder to old, change poppler finder case to match pkgconfig

Added:
    trunk/Scribus/cmake/modules/old/FindFontconfig.cmake
      - copied unchanged from r24335, trunk/Scribus/cmake/modules/FindFontconfig.cmake
Modified:
    trunk/Scribus/cmake/modules/FindFontconfig.cmake
    trunk/Scribus/cmake/modules/FindPOPPLER.cmake

Modified: trunk/Scribus/cmake/modules/FindPOPPLER.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24336&path=/trunk/Scribus/cmake/modules/FindPOPPLER.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindPOPPLER.cmake	(original)
+++ trunk/Scribus/cmake/modules/FindPOPPLER.cmake	Mon Dec 21 22:15:19 2020
@@ -1,41 +1,42 @@
-include(FindPkgConfig)
-pkg_search_module(POPPLER libpoppler>=0.62.0 poppler>=0.62.0)
-if (POPPLER_FOUND)
-	pkg_search_module(POPPLER_CPP REQUIRED libpoppler-cpp>=0.62.0 poppler-cpp>=0.62.0)
-endif(POPPLER_FOUND)
+#include(FindPkgConfig)
+find_package(PkgConfig QUIET)
+pkg_search_module(poppler libpoppler>=0.62.0 poppler>=0.62.0)
+if (poppler_FOUND)
+	pkg_search_module(poppler_cpp REQUIRED libpoppler-cpp>=0.62.0 poppler-cpp>=0.62.0)
+endif(poppler_FOUND)
  
-find_path(POPPLER_INCLUDE_DIR 
+find_path(poppler_INCLUDE_DIR
 	NAMES poppler-config.h
-	PATHS ${PKG_POPPLER_INCLUDE_DIRS} ${POPPLER_INCLUDE_DIRS} /usr/local/include /usr/include
+	PATHS ${PKG_poppler_INCLUDE_DIRS} ${poppler_INCLUDE_DIRS} /usr/local/include /usr/include
 	PATH_SUFFIXES poppler
 	NO_DEFAULT_PATH
 	)
 
-find_path(POPPLER_CPP_INCLUDE_DIR 
+find_path(poppler_cpp_INCLUDE_DIR
 	NAMES poppler-version.h
-	PATHS ${PKG_POPPLER_CPP_INCLUDE_DIRS} ${POPPLER_CPP_INCLUDE_DIRS} /usr/local/include /usr/include
+	PATHS ${PKG_poppler_CPP_INCLUDE_DIRS} ${poppler_CPP_INCLUDE_DIRS} /usr/local/include /usr/include
 	PATH_SUFFIXES poppler
 	NO_DEFAULT_PATH
 	)
 
-find_library(POPPLER_LIBRARY
+find_library(poppler_LIBRARY
 	NAMES libpoppler poppler
-	PATHS ${PKG_POPPLER_LIBRARIES} ${POPPLER_LIBRARY_DIRS} /usr/local/lib /usr/lib /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
+	PATHS ${PKG_poppler_LIBRARIES} ${poppler_LIBRARY_DIRS} /usr/local/lib /usr/lib /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
 	PATH_SUFFIXES poppler
 	NO_DEFAULT_PATH
 	)
 
-find_library(POPPLER_CPP_LIBRARY
+find_library(poppler_cpp_LIBRARY
 	NAMES libpoppler-cpp poppler-cpp
-	PATHS ${PKG_POPPLER_CPP_LIBRARIES} ${POPPLER_CPP_LIBRARY_DIRS} /usr/local/lib /usr/lib /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
+	PATHS ${PKG_poppler_CPP_LIBRARIES} ${poppler_CPP_LIBRARY_DIRS} /usr/local/lib /usr/lib /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
 	PATH_SUFFIXES poppler
 	NO_DEFAULT_PATH
 	)
 
-if (POPPLER_LIBRARY)
-	if (POPPLER_INCLUDE_DIR AND POPPLER_CPP_INCLUDE_DIR)
+if (poppler_LIBRARY)
+	if (poppler_INCLUDE_DIR AND poppler_cpp_INCLUDE_DIR)
 		set( FOUND_POPPLER ON )
-		set( POPPLER_LIBRARIES ${POPPLER_LIBRARY} ${POPPLER_CPP_LIBRARY} )
-		set( POPPLER_INCLUDES ${POPPLER_INCLUDE_DIR} ${POPPLER_CPP_INCLUDE_DIR} )
-	endif (POPPLER_INCLUDE_DIR AND POPPLER_CPP_INCLUDE_DIR)
-endif (POPPLER_LIBRARY)
+		set( poppler_LIBRARIES ${poppler_LIBRARY} ${poppler_cpp_LIBRARY} )
+		set( poppler_INCLUDES ${poppler_INCLUDE_DIR} ${poppler_cpp_INCLUDE_DIR} )
+	endif (poppler_INCLUDE_DIR AND poppler_cpp_INCLUDE_DIR)
+endif (poppler_LIBRARY)