Title: [282646] releases/WebKitGTK/webkit-2.34
- Revision
- 282646
- Author
- [email protected]
- Date
- 2021-09-17 02:15:48 -0700 (Fri, 17 Sep 2021)
Log Message
Merge r282065 - [CMake] Prefer python3 over python2
https://bugs.webkit.org/show_bug.cgi?id=229969
Reviewed by Michael Catanzaro.
Use the CMake module FindPython instead of FindPythonInterp.
FindPython looks preferably for version 3 of Python. If not found, then it looks for version 2.
* Source/cmake/WebKitCommon.cmake:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.34/ChangeLog (282645 => 282646)
--- releases/WebKitGTK/webkit-2.34/ChangeLog 2021-09-17 09:13:23 UTC (rev 282645)
+++ releases/WebKitGTK/webkit-2.34/ChangeLog 2021-09-17 09:15:48 UTC (rev 282646)
@@ -1,3 +1,15 @@
+2021-09-06 Carlos Alberto Lopez Perez <[email protected]>
+
+ [CMake] Prefer python3 over python2
+ https://bugs.webkit.org/show_bug.cgi?id=229969
+
+ Reviewed by Michael Catanzaro.
+
+ Use the CMake module FindPython instead of FindPythonInterp.
+ FindPython looks preferably for version 3 of Python. If not found, then it looks for version 2.
+
+ * Source/cmake/WebKitCommon.cmake:
+
2021-09-11 Adrian Perez de Castro <[email protected]>
Unreviewed. Update OptionsWPE.cmake and NEWS for the 2.33.90 release
Modified: releases/WebKitGTK/webkit-2.34/Source/cmake/WebKitCommon.cmake (282645 => 282646)
--- releases/WebKitGTK/webkit-2.34/Source/cmake/WebKitCommon.cmake 2021-09-17 09:13:23 UTC (rev 282645)
+++ releases/WebKitGTK/webkit-2.34/Source/cmake/WebKitCommon.cmake 2021-09-17 09:15:48 UTC (rev 282646)
@@ -177,8 +177,10 @@
find_package(Perl 5.10.0 REQUIRED)
find_package(PerlModules COMPONENTS JSON::PP REQUIRED)
- set(Python_ADDITIONAL_VERSIONS 3)
- find_package(PythonInterp 2.7.0 REQUIRED)
+ # This module looks preferably for version 3 of Python. If not found, version 2 is searched.
+ find_package(Python COMPONENTS Interpreter REQUIRED)
+ # Set the variable with uppercase name to keep compatibility with code and users expecting it.
+ set(PYTHON_EXECUTABLE ${Python_EXECUTABLE} CACHE FILEPATH "Path to the Python interpreter")
# We cannot check for RUBY_FOUND because it is set only when the full package is installed and
# the only thing we need is the interpreter. Unlike Python, cmake does not provide a macro
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
