File texworks-cmake-find-python.patch of Package texworks

Overview Repositories Revisions Requests Users Attributes Meta

File texworks-cmake-find-python.patch of Package texworks

From dae1586af7a218e9bbe9ce3031a97e8efcac980a Mon Sep 17 00:00:00 2001
From: Atri Bhattacharya <A.Bhattacharya@uliege.be>
Date: Thu, 15 Feb 2024 20:03:50 +0100
Subject: [PATCH] Fix finding Python with CMake >= 3.27 (fixes #1039)

---
 CMakeLists.txt                            | 38 ++++++++++++++---------
 plugins-src/TWPythonPlugin/CMakeLists.txt |  4 +--
 src/CMakeLists.txt                        |  4 +--
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f245e5192..9682c3933 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -326,17 +326,27 @@ ENDIF()
 
 IF ( WITH_PYTHON )
   IF ( USE_SYSTEM_PYTHON )
-    SET(PYTHON_LIBRARIES "-F/System/Library/Frameworks -framework Python" CACHE PATH "Python library.")
-    SET(PYTHON_INCLUDE_DIR "/System/Library/Framework/Python.framework/Headers" CACHE PATH "Python framework.")
-    MARK_AS_ADVANCED(PYTHON_LIBRARIES)
-    MARK_AS_ADVANCED(PYTHON_INCLUDE_DIR)
-    SET(PYTHONLIBS_FOUND TRUE)
+    SET(Python_LIBRARIES "-F/System/Library/Frameworks -framework Python" CACHE PATH "Python library.")
+    SET(Python_INCLUDE_DIR "/System/Library/Framework/Python.framework/Headers" CACHE PATH "Python framework.")
+    MARK_AS_ADVANCED(Python_LIBRARIES)
+    MARK_AS_ADVANCED(Python_INCLUDE_DIR)
+    SET(Python_Interpreter_FOUND TRUE)
+    SET(Python_Development_FOUND TRUE)
   ELSE ()
-    # **NOTE**
-    # In order to find the correct version of 'PythonLibs', it seems that we need to run 'FIND_PACKAGE(PythonInterp)' firstly.
-    # In order to find the correct version of 'PythonInterp', we need to set 'PYTHONHOME' environment variable
-    FIND_PACKAGE(PythonInterp)
-    FIND_PACKAGE(PythonLibs)
+    IF (CMAKE_VERSION VERSION_LESS "3.12")
+      # **NOTE**
+      # In order to find the correct version of 'PythonLibs', it seems that we need to run 'FIND_PACKAGE(PythonInterp)' firstly.
+      # In order to find the correct version of 'PythonInterp', we need to set 'PYTHONHOME' environment variable
+      FIND_PACKAGE(PythonInterp)
+      FIND_PACKAGE(PythonLibs)
+      SET(Python_INCLUDE_DIRS ${PYTHON_INCLUDE_DIRS})
+      SET(Python_LIBRARIES ${PYTHON_LIBRARIES})
+      SET(Python_VERSION ${PYTHON_VERSION_STRING})
+      SET(Python_Interpreter_FOUND ${PYTHONINTERP_FOUND})
+      SET(Python_Development_FOUND ${PYTHONLIBS_FOUND})
+    ELSE ()
+      FIND_PACKAGE(Python COMPONENTS Interpreter Development)
+    ENDIF ()
   ENDIF ()
 ENDIF()
 
@@ -344,7 +354,7 @@ IF ( LUA_FOUND AND WITH_LUA AND NOT ${BUILD_SHARED_PLUGINS})
   ADD_DEFINITIONS(-DQT_STATICPLUGIN -DSTATIC_LUA_SCRIPTING_PLUGIN)
 ENDIF ()
 
-IF ( PYTHONLIBS_FOUND AND WITH_PYTHON AND NOT ${BUILD_SHARED_PLUGINS})
+IF ( Python_Interpreter_FOUND AND Python_Development_FOUND AND WITH_PYTHON AND NOT ${BUILD_SHARED_PLUGINS})
   ADD_DEFINITIONS(-DQT_STATICPLUGIN -DSTATIC_PYTHON_SCRIPTING_PLUGIN)
 ENDIF ()
 
@@ -406,7 +416,7 @@ IF ( LUA_FOUND AND WITH_LUA )
   ADD_SUBDIRECTORY(${TeXworks_SOURCE_DIR}/plugins-src/TWLuaPlugin)
 ENDIF ()
 
-IF ( PYTHONLIBS_FOUND AND WITH_PYTHON )
+IF ( Python_Interpreter_FOUND AND Python_Development_FOUND AND WITH_PYTHON )
   ADD_SUBDIRECTORY(${TeXworks_SOURCE_DIR}/plugins-src/TWPythonPlugin)
 ENDIF ()
 
@@ -509,7 +519,7 @@ IF ( WITH_LUA )
   CONFIG_VERSION("Lua" "${LUA_VERSION_STRING}")
 ENDIF()
 if (WITH_PYTHON)
-  CONFIG_VERSION("Python" "${PYTHON_VERSION_STRING}")
+  CONFIG_VERSION("Python" "${Python_VERSION}")
 endif()
 CONFIG_VERSION("Qt" ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH})
 CONFIG_VERSION("SyncTeX" "${SYNCTEX_VERSION_STRING}")
@@ -520,7 +530,7 @@ message("  Scripting")
 CONFIG_YESNO("  ECMA scripting" ON)
 CONFIG_YESNO("  QtScript scripting" WITH_QTSCRIPT)
 CONFIG_YESNO("  Lua scripting plugin" LUA_FOUND)
-CONFIG_YESNO("  Python scripting plugin" PYTHONLIBS_FOUND)
+CONFIG_YESNO("  Python scripting plugin" Python_Development_FOUND)
 message("")
 
 CONFIG_INFO("Build ID" ${TW_BUILD_ID})
diff --git a/plugins-src/TWPythonPlugin/CMakeLists.txt b/plugins-src/TWPythonPlugin/CMakeLists.txt
index 255937f17..6d99c5a68 100644
--- a/plugins-src/TWPythonPlugin/CMakeLists.txt
+++ b/plugins-src/TWPythonPlugin/CMakeLists.txt
@@ -37,13 +37,13 @@ if (NOT MSVC)
 	target_compile_options(TWPythonPlugin PRIVATE -Wno-old-style-cast)
 endif ()
 
-target_include_directories(TWPythonPlugin SYSTEM PRIVATE ${PYTHON_INCLUDE_DIRS})
+target_include_directories(TWPythonPlugin SYSTEM PRIVATE ${Python_INCLUDE_DIRS})
 target_include_directories(TWPythonPlugin PRIVATE ${TeXworks_SOURCE_DIR}/src)
 
 # Specify link libraries even if the plugin is built statically so all the
 # interface properties of the Qt targets (include directories, lib directories,
 # etc.) are available
-TARGET_LINK_LIBRARIES(TWPythonPlugin ${QT_LIBRARIES} ${PYTHON_LIBRARIES} ${TEXWORKS_ADDITIONAL_LIBS})
+TARGET_LINK_LIBRARIES(TWPythonPlugin ${QT_LIBRARIES} ${Python_LIBRARIES} ${TEXWORKS_ADDITIONAL_LIBS})
 IF (${BUILD_SHARED_PLUGINS})
   INSTALL(TARGETS TWPythonPlugin
     LIBRARY DESTINATION ${TeXworks_PLUGIN_DIR}
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ba2f40351..3f91ab887 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -207,8 +207,8 @@ IF (NOT ${BUILD_SHARED_PLUGINS})
   IF (WITH_LUA AND LUA_FOUND)
     LIST(INSERT TeXworks_LIBS 0 TWLuaPlugin ${LUA_LIBRARIES})
   ENDIF()
-  IF (WITH_PYTHON AND PYTHONLIBS_FOUND)
-    LIST(INSERT TeXworks_LIBS 0 TWPythonPlugin ${PYTHON_LIBRARIES})
+  IF (WITH_PYTHON AND Python_Development_FOUND)
+    LIST(INSERT TeXworks_LIBS 0 TWPythonPlugin ${Python_LIBRARIES})
   ENDIF()
 ENDIF()

Places

File texworks-cmake-find-python.patch of Package texworks

Places