[poppler] CMakeLists.txt

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Sun Oct 4 17:08:11 UTC 2020


 CMakeLists.txt |   13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

New commits:
commit 6487612a84b4152c82aa4334a3ef2f1aa4dc7f6f
Author: Kyle Auble <kyle.auble at outlook.com>
Date:   Sun Oct 4 16:38:59 2020 +0000

    cmake: Remove python libraries check
    
    * FindPythonLibs is for C/C++ bindings, not typical python modules
    * Also make comments & messages clearer

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee36242d..3da3fb3b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -203,17 +203,16 @@ endif()
 
 # GTK API docs require both the gtk-doc package & python3 support
 if(ENABLE_GTK_DOC)
-  # Disable gtk-doc generation & warn if the package is missing
+  # Stop the build & raise an error if the package is missing
   find_package(GtkDoc)
   if(NOT GtkDoc_FOUND)
-    message(FATAL_ERROR "Install the gtk-doc package to generate GTK API documentation")
+    message(FATAL_ERROR "Install the gtk-doc package to generate GTK API documentation, or set ENABLE_GTK_DOC to Off.")
   endif()
-  # NOTE: These Find<...> modules are deprecated, but the newer FindPython3 module requires CMake >=3.12
+  # NOTE: The FindPythonInterp module is deprecated, but the newer FindPython3 module requires CMake >=3.12
   find_package(PythonInterp 3)
-  find_package(PythonLibs 3)
-  # Also disable gtk-doc generation & raise a warning if Python3 is missing
-  if(NOT (PYTHONINTERP_FOUND AND PYTHONLIBS_FOUND))
-    message(FATAL_ERROR "ENABLE_GTK_DOC requires a python3 interpreter and libraries.")
+  # Also bail out with an error if Python3 is missing
+  if(NOT PYTHONINTERP_FOUND)
+    message(FATAL_ERROR "Install python3 in order to generate GTK API documentation, or set ENABLE_GTK_DOC to Off.")
   endif()
 endif()
 


More information about the poppler mailing list