Changeset 212435 in webkit

Timestamp:

Feb 16, 2017 9:11:05 AM (7 years ago)

Author:

Konstantin Tokarev

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:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/WebKitMacros.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2017-02-16  Konstantin Tokarev  <annulen@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  <cgarcia@igalia.com>
 

trunk/Source/cmake/WebKitMacros.cmake

@@ -386 +386 @@
 
 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=${JavaScriptCore_SCRIPTS_DIR}")
+    elseif (WIN32)
         set(_python_path set "PYTHONPATH=${JavaScriptCore_SCRIPTS_DIR}" &&)
     else ()