scribus-commit
2018-11-12 21:26:59 UTC
Author: jghali
Date: Mon Nov 12 21:26:59 2018
New Revision: 22756
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22756
Log:
Make sure cmake exit with an error if poppler is not found
Modified:
trunk/Scribus/CMakeLists.txt
Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22756&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Mon Nov 12 21:26:59 2018
@@ -920,16 +920,12 @@
#<<Poppler for PDF import
find_package(POPPLER REQUIRED)
if (POPPLER_FOUND)
- if (FREETYPE_FOUND)
- set( HAVE_POPPLER 1 )
- message(STATUS "Found poppler")
- message(STATUS "Found poppler libs: ${POPPLER_LIBRARY}")
- message(STATUS "Found poppler includes: ${POPPLER_INCLUDE_DIR}")
- else()
- message("Poppler NOT found - Disabling support for native PDF import")
- endif()
-else()
- message("Poppler NOT found - Disabling support for native PDF import")
+ set( HAVE_POPPLER 1 )
+ message(STATUS "Found poppler")
+ 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()
#>>Poppler for PDF import
Date: Mon Nov 12 21:26:59 2018
New Revision: 22756
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22756
Log:
Make sure cmake exit with an error if poppler is not found
Modified:
trunk/Scribus/CMakeLists.txt
Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22756&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Mon Nov 12 21:26:59 2018
@@ -920,16 +920,12 @@
#<<Poppler for PDF import
find_package(POPPLER REQUIRED)
if (POPPLER_FOUND)
- if (FREETYPE_FOUND)
- set( HAVE_POPPLER 1 )
- message(STATUS "Found poppler")
- message(STATUS "Found poppler libs: ${POPPLER_LIBRARY}")
- message(STATUS "Found poppler includes: ${POPPLER_INCLUDE_DIR}")
- else()
- message("Poppler NOT found - Disabling support for native PDF import")
- endif()
-else()
- message("Poppler NOT found - Disabling support for native PDF import")
+ set( HAVE_POPPLER 1 )
+ message(STATUS "Found poppler")
+ 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()
#>>Poppler for PDF import