Changeset 230585 in webkit
- Timestamp:
- Apr 12, 2018 11:19:50 AM (6 years ago)
- Location:
- trunk/Source
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r230577 r230585 1 2018-04-12 Michael Catanzaro <mcatanzaro@igalia.com> 2 3 [WPE] Move libWPEWebInspectorResources.so to pkglibdir 4 https://bugs.webkit.org/show_bug.cgi?id=184379 5 6 Reviewed by Žan Doberšek. 7 8 Load the module from the new location. 9 10 * PlatformWPE.cmake: 11 * inspector/remote/glib/RemoteInspectorUtils.cpp: 12 (Inspector::backendCommands): 13 1 14 2018-04-12 Yusuke Suzuki <utatane.tea@gmail.com> 2 15 -
trunk/Source/JavaScriptCore/PlatformWPE.cmake
r230576 r230585 34 34 35 35 add_definitions(-DJSC_COMPILATION) 36 add_definitions(-DPKGLIBDIR="${CMAKE_INSTALL_FULL_LIBDIR}/wpe-webkit-${WPE_API_VERSION}") -
trunk/Source/JavaScriptCore/inspector/remote/glib/RemoteInspectorUtils.cpp
r217832 r230585 46 46 static std::once_flag flag; 47 47 std::call_once(flag, [] { 48 GModule* resourcesModule = g_module_open( "libWPEWebInspectorResources.so", G_MODULE_BIND_LAZY);48 GModule* resourcesModule = g_module_open(PKGLIBDIR G_DIR_SEPARATOR_S "libWPEWebInspectorResources.so", G_MODULE_BIND_LAZY); 49 49 if (!resourcesModule) { 50 50 WTFLogAlways("Error loading libWPEWebInspectorResources.so: %s", g_module_error()); -
trunk/Source/WebKit/ChangeLog
r230576 r230585 1 2018-04-12 Michael Catanzaro <mcatanzaro@igalia.com> 2 3 [WPE] Move libWPEWebInspectorResources.so to pkglibdir 4 https://bugs.webkit.org/show_bug.cgi?id=184379 5 6 Reviewed by Žan Doberšek. 7 8 This is important to allow parallel installation. 9 10 * PlatformWPE.cmake: 11 1 12 2018-04-12 Michael Catanzaro <mcatanzaro@igalia.com> 2 13 -
trunk/Source/WebKit/PlatformWPE.cmake
r230576 r230585 314 314 target_link_libraries(WPEWebInspectorResources ${WPEWebInspectorResources_LIBRARIES}) 315 315 target_include_directories(WPEWebInspectorResources SYSTEM PUBLIC ${WPEWebInspectorResources_SYSTEM_INCLUDE_DIRECTORIES}) 316 install(TARGETS WPEWebInspectorResources DESTINATION "${LIB_INSTALL_DIR} ")316 install(TARGETS WPEWebInspectorResources DESTINATION "${LIB_INSTALL_DIR}/wpe-webkit-${WPE_API_VERSION}") 317 317 318 318 add_library(WPEInjectedBundle MODULE "${WEBKIT_DIR}/WebProcess/InjectedBundle/API/glib/WebKitInjectedBundleMain.cpp")
Note: See TracChangeset
for help on using the changeset viewer.