Changeset 198058 in webkit

Timestamp:

Mar 12, 2016 2:23:40 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

.:
[GTK][Mac] Don't force ENABLE_INTROSPECTION=OFF on Mac
​https://bugs.webkit.org/show_bug.cgi?id=152650

Patch by Jeremy Huddleston Sequoia <​jeremyhu@apple.com> on 2016-03-12
Reviewed by Carlos Garcia Campos.

• Source/cmake/OptionsGTK.cmake:

Source/WebKit2:
[GTK][Mac] Use DYLD_LIBRARY_PATH on OSX rather then LD_LIBRARY_PATH
​https://bugs.webkit.org/show_bug.cgi?id=152650

Patch by Jeremy Huddleston Sequoia <​jeremyhu@apple.com> on 2016-03-12
Reviewed by Carlos Garcia Campos.

• PlatformGTK.cmake:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/PlatformGTK.cmake (modified) (4 diffs)
• Source/cmake/OptionsGTK.cmake (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2016-03-12  Jeremy Huddleston Sequoia  <jeremyhu@apple.com>
+
+        [GTK][Mac] Don't force ENABLE_INTROSPECTION=OFF on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=152650
+
+        Reviewed by Carlos Garcia Campos.
+
+        * Source/cmake/OptionsGTK.cmake:
+
 2016-03-10  Frederic Wang  <fwang@igalia.org>
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-03-12  Jeremy Huddleston Sequoia  <jeremyhu@apple.com>
+
+        [GTK][Mac] Use DYLD_LIBRARY_PATH on OSX rather then LD_LIBRARY_PATH
+        https://bugs.webkit.org/show_bug.cgi?id=152650
+
+        Reviewed by Carlos Garcia Campos.
+
+        * PlatformGTK.cmake:
+
 2016-03-11  John Wilander  <wilander@apple.com>
 

trunk/Source/WebKit2/PlatformGTK.cmake

@@ -889 +889 @@
 target_link_libraries(webkit2gtkinjectedbundle WebKit2)
 
-# Add ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} to LD_LIBRARY_PATH
-string(COMPARE EQUAL "$ENV{LD_LIBRARY_PATH}" "" ld_library_path_not_exist)
+# Add ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} to LD_LIBRARY_PATH or DYLD_LIBRARY_PATH
+if (APPLE)
+    set(LOADER_LIBRARY_PATH_VAR "DYLD_LIBRARY_PATH")
+    set(PREV_LOADER_LIBRARY_PATH "$ENV{DYLD_LIBRARY_PATH}")
+else ()
+    set(LOADER_LIBRARY_PATH_VAR "LD_LIBRARY_PATH")
+    set(PREV_LOADER_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}")
+endif ()
+
+string(COMPARE EQUAL "${PREV_LOADER_LIBRARY_PATH}" "" ld_library_path_not_exist)
 if (ld_library_path_does_not_exist)
     set(INTROSPECTION_ADDITIONAL_LIBRARY_PATH
@@ -897 +905 @@
 else ()
     set(INTROSPECTION_ADDITIONAL_LIBRARY_PATH
-        "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{LD_LIBRARY_PATH}"
+        "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:${PREV_LOADER_LIBRARY_PATH}"
     )
 endif ()
@@ -910 +918 @@
     DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
     COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations LDFLAGS=
-        LD_LIBRARY_PATH="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
+        ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
         ${INTROSPECTION_SCANNER}
         --quiet
@@ -952 +960 @@
     COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
         LDFLAGS="${INTROSPECTION_ADDITIONAL_LDFLAGS}"
-        LD_LIBRARY_PATH="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
+        ${LOADER_LIBRARY_PATH_VAR}="${INTROSPECTION_ADDITIONAL_LIBRARY_PATH}"
         ${INTROSPECTION_SCANNER}
         --quiet

trunk/Source/cmake/OptionsGTK.cmake

@@ -420 +420 @@
 endif ()
 
-# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building or when building on Mac.
-if (CMAKE_CROSSCOMPILING OR APPLE)
+# Override the cached variables, gtk-doc and gobject-introspection do not really work when cross-building.
+if (CMAKE_CROSSCOMPILING)
     set(ENABLE_GTKDOC OFF)
     set(ENABLE_INTROSPECTION OFF)
+endif ()
+
+# Override the cached variable, gtk-doc does not really work when building on Mac.
+if (APPLE)
+    set(ENABLE_GTKDOC OFF)
 endif ()