Title: [198058] trunk
- Revision
- 198058
- Author
- [email protected]
- Date
- 2016-03-12 02:23:40 -0800 (Sat, 12 Mar 2016)
Log 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 <[email protected]> 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 <[email protected]> on 2016-03-12
Reviewed by Carlos Garcia Campos.
* PlatformGTK.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (198057 => 198058)
--- trunk/ChangeLog 2016-03-12 03:28:32 UTC (rev 198057)
+++ trunk/ChangeLog 2016-03-12 10:23:40 UTC (rev 198058)
@@ -1,3 +1,12 @@
+2016-03-12 Jeremy Huddleston Sequoia <[email protected]>
+
+ [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 <[email protected]>
[GTK] Add support for WOFF2
Modified: trunk/Source/WebKit2/ChangeLog (198057 => 198058)
--- trunk/Source/WebKit2/ChangeLog 2016-03-12 03:28:32 UTC (rev 198057)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-12 10:23:40 UTC (rev 198058)
@@ -1,3 +1,12 @@
+2016-03-12 Jeremy Huddleston Sequoia <[email protected]>
+
+ [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 <[email protected]>
Move prevalent resource classifier from WebCore to WebKit.
Modified: trunk/Source/WebKit2/PlatformGTK.cmake (198057 => 198058)
--- trunk/Source/WebKit2/PlatformGTK.cmake 2016-03-12 03:28:32 UTC (rev 198057)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2016-03-12 10:23:40 UTC (rev 198058)
@@ -888,15 +888,23 @@
add_webkit2_prefix_header(webkit2gtkinjectedbundle)
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
"${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
)
else ()
set(INTROSPECTION_ADDITIONAL_LIBRARY_PATH
- "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:$ENV{LD_LIBRARY_PATH}"
+ "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}:${PREV_LOADER_LIBRARY_PATH}"
)
endif ()
@@ -909,7 +917,7 @@
DEPENDS WebKit2
DEPENDS ${CMAKE_BINARY_DIR}/_javascript_Core-${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
--warn-all
@@ -951,7 +959,7 @@
DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
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
--warn-all
Modified: trunk/Source/cmake/OptionsGTK.cmake (198057 => 198058)
--- trunk/Source/cmake/OptionsGTK.cmake 2016-03-12 03:28:32 UTC (rev 198057)
+++ trunk/Source/cmake/OptionsGTK.cmake 2016-03-12 10:23:40 UTC (rev 198058)
@@ -419,12 +419,17 @@
endif ()
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 ()
+
set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
set(DERIVED_SOURCES_WEBKITGTK_DIR ${DERIVED_SOURCES_DIR}/webkitgtk)
set(DERIVED_SOURCES_WEBKITGTK_API_DIR ${DERIVED_SOURCES_WEBKITGTK_DIR}/webkit)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
