Title: [212435] trunk
- Revision
- 212435
- Author
- annu...@yandex.ru
- Date
- 2017-02-16 09:11:05 -0800 (Thu, 16 Feb 2017)
Log Message
[cmake] Use env command to set PYTHONPATH if cmake is new enough
https://bugs.webkit.org/show_bug.cgi?id=156833
Reviewed by Alex Christensen.
This change fixes 2 issues when CMake >= 3.1 is used:
- When PYTHONPATH contains special characters, CMake adds quotes around
"PYTHONPATH=..." and produces broken build command in non-WIN32 case.
- On WIN32, unix-like shell can be used instead of cmd.exe, but this case
cannot be easily detected in cmake.
* Source/cmake/WebKitMacros.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (212434 => 212435)
--- trunk/ChangeLog 2017-02-16 17:05:55 UTC (rev 212434)
+++ trunk/ChangeLog 2017-02-16 17:11:05 UTC (rev 212435)
@@ -1,3 +1,18 @@
+2017-02-16 Konstantin Tokarev <annu...@yandex.ru>
+
+ [cmake] Use env command to set PYTHONPATH if cmake is new enough
+ https://bugs.webkit.org/show_bug.cgi?id=156833
+
+ Reviewed by Alex Christensen.
+
+ This change fixes 2 issues when CMake >= 3.1 is used:
+ - When PYTHONPATH contains special characters, CMake adds quotes around
+ "PYTHONPATH=..." and produces broken build command in non-WIN32 case.
+ - On WIN32, unix-like shell can be used instead of cmd.exe, but this case
+ cannot be easily detected in cmake.
+
+ * Source/cmake/WebKitMacros.cmake:
+
2017-02-15 Carlos Garcia Campos <cgar...@igalia.com>
Unreviewed. Add ENABLE_INTERSECTION_OBSERVER option to CMake.
Modified: trunk/Source/cmake/WebKitMacros.cmake (212434 => 212435)
--- trunk/Source/cmake/WebKitMacros.cmake 2017-02-16 17:05:55 UTC (rev 212434)
+++ trunk/Source/cmake/WebKitMacros.cmake 2017-02-16 17:11:05 UTC (rev 212435)
@@ -385,7 +385,9 @@
endmacro()
macro(MAKE_JS_FILE_ARRAYS _output_cpp _output_h _scripts _scripts_dependencies)
- if (WIN32)
+ if (NOT CMAKE_VERSION VERSION_LESS 3.1)
+ set(_python_path ${CMAKE_COMMAND} -E env "PYTHONPATH=${_javascript_Core_SCRIPTS_DIR}")
+ elseif (WIN32)
set(_python_path set "PYTHONPATH=${_javascript_Core_SCRIPTS_DIR}" &&)
else ()
set(_python_path "PYTHONPATH=${_javascript_Core_SCRIPTS_DIR}")
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
