r24339 by craig - Change poppler finder code to new name, fixes CMake warnings

[scribus-commit]

Author: craig
Date: Mon Dec 21 22:19:46 2020
New Revision: 24339

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24339
Log:
Change poppler finder code to new name, fixes CMake warnings

Modified:
    trunk/Scribus/CMakeLists_Dependencies.cmake
    trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt

Modified: trunk/Scribus/CMakeLists_Dependencies.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24339&path=/trunk/Scribus/CMakeLists_Dependencies.cmake
==============================================================================
--- trunk/Scribus/CMakeLists_Dependencies.cmake	(original)
+++ trunk/Scribus/CMakeLists_Dependencies.cmake	Mon Dec 21 22:19:46 2020
@@ -272,12 +272,12 @@
 #>> GraphicsMagick for image import
 
 #<<Poppler for PDF import
-find_package(POPPLER REQUIRED)
-if (POPPLER_FOUND)
+find_package(poppler REQUIRED)
+if (poppler_FOUND)
 	set(HAVE_POPPLER ON)
 	message(STATUS "Found poppler")
-	message(STATUS "Found poppler libs: ${POPPLER_LIBRARY}")
-	message(STATUS "Found poppler includes: ${POPPLER_INCLUDE_DIR}")
+	message(STATUS "Found poppler libs: ${poppler_LIBRARY}")
+	message(STATUS "Found poppler includes: ${poppler_INCLUDE_DIR}")
 else()
 	message(FATAL_ERROR "Could not find poppler library")
 endif()

Modified: trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24339&path=/trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt	Mon Dec 21 22:19:46 2020
@@ -1,8 +1,8 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-	${POPPLER_INCLUDE_DIR}
-	${POPPLER_CPP_INCLUDE_DIR}
+	${poppler_INCLUDE_DIR}
+	${poppler_CPP_INCLUDE_DIR}
 )
 
 set(IMPORTPDF_PLUGIN_UI_SRC
@@ -37,7 +37,7 @@
 add_library(${SCRIBUS_IMPORTPDF_PLUGIN} MODULE ${IMPORTPDF_PLUGIN_SOURCES} ${IMPORTPDF_PLUGIN_MOC_SOURCES} ${IMPORTPDF_PLUGIN_UI_SOURCES})
 
 link_directories( /usr/local/lib )
-target_link_libraries(${SCRIBUS_IMPORTPDF_PLUGIN} ${PLUGIN_LIBRARIES} ${POPPLER_LIBRARY})
+target_link_libraries(${SCRIBUS_IMPORTPDF_PLUGIN} ${PLUGIN_LIBRARIES} ${poppler_LIBRARY})
 
 if(WANT_PCH)
 	target_precompile_headers(${SCRIBUS_IMPORTPDF_PLUGIN} PRIVATE "../../plugins_pch.h")