Changeset 60909 in webkit
- Timestamp:
- Jun 9, 2010 1:31:37 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/CMakeLists.txt
r59537 r60909 66 66 67 67 # ----------------------------------------------------------------------------- 68 # Default library types (can be overrriden in Options${PORT}.cmake file)68 # Default library types 69 69 # ----------------------------------------------------------------------------- 70 SET(WTF_LIBRARY_TYPE STATIC) 71 SET(JavaScriptCore_LIBRARY_TYPE STATIC) 72 SET(WebCore_LIBRARY_TYPE STATIC) 70 OPTION(SHARED_CORE "build WTF, JavaScriptCore and WebCore as shared libraries") 71 72 IF (SHARED_CORE) 73 SET(WTF_LIBRARY_TYPE SHARED) 74 SET(JavaScriptCore_LIBRARY_TYPE SHARED) 75 SET(WebCore_LIBRARY_TYPE SHARED) 76 ELSE () 77 SET(WTF_LIBRARY_TYPE STATIC) 78 SET(JavaScriptCore_LIBRARY_TYPE STATIC) 79 SET(WebCore_LIBRARY_TYPE STATIC) 80 ENDIF () 81 73 82 SET(WebKit_LIBRARY_TYPE SHARED) 74 83 -
trunk/ChangeLog
r60842 r60909 1 2010-06-09 Leandro Pereira <leandro@profusion.mobi> 2 3 Reviewed by Adam Treat. 4 5 [EFL] Allow building core libraries as shared objects to speed up 6 linking time on machines with small amounts of memory. 7 http://webkit.org/b/39899 8 9 * CMakeLists.txt: Add SHARED_CORE option. 10 * cmake/FindGlib.cmake: Add GObject to the list of GLib libraries to 11 search. 12 * cmake/OptionsEfl.cmake: Remove default library type definitions. 13 * cmake/WebKitHelpers.cmake: -fvisibility=hidden did not behave well 14 when SHARED_CORE is used. 15 1 16 2010-06-08 Xan Lopez <xlopez@igalia.com> 2 17 -
trunk/JavaScriptCore/CMakeLists.txt
r59955 r60909 275 275 ADD_TARGET_PROPERTIES(${JavaScriptCore_LIBRARY_NAME} LINK_FLAGS ${JavaScriptCore_LINK_FLAGS}) 276 276 277 INSTALL(TARGETS ${JavaScriptCore_LIBRARY_NAME} DESTINATION lib) 278 277 IF (SHARED_CORE) 278 INSTALL(TARGETS ${JavaScriptCore_LIBRARY_NAME} DESTINATION lib) 279 ENDIF () -
trunk/JavaScriptCore/ChangeLog
r60901 r60909 1 2010-06-09 Leandro Pereira <leandro@profusion.mobi> 2 3 Reviewed by Adam Treat. 4 5 [EFL] Allow building core libraries as shared objects to speed up 6 linking time on machines with small amounts of memory. 7 http://webkit.org/b/39899 8 9 * CMakeLists.txt: If building with shared core, install the lib. 10 * jsc/CMakeListsEfl.txt: Needs Glib and Ecore to link dynamically. 11 * wtf/CMakeLists.txt: If building with shared core, install the lib. 12 1 13 2010-06-09 Gabor Loki <loki@webkit.org> 2 14 -
trunk/JavaScriptCore/jsc/CMakeListsEfl.txt
r59537 r60909 1 LIST(APPEND JSC_LIBRARIES 2 ${Glib_LIBRARIES} 3 ${ECORE_LIBRARIES} 4 ) 5 1 6 LIST(APPEND JSC_LINK_FLAGS 2 7 ${ECORE_LDFLAGS} -
trunk/JavaScriptCore/wtf/CMakeLists.txt
r59537 r60909 40 40 41 41 ADD_TARGET_PROPERTIES(${WTF_LIBRARY_NAME} LINK_FLAGS ${WTF_LINK_FLAGS}) 42 43 IF (SHARED_CORE) 44 INSTALL(TARGETS ${WTF_LIBRARY_NAME} DESTINATION lib) 45 ENDIF () -
trunk/WebCore/CMakeLists.txt
r60902 r60909 1261 1261 plugins/PluginMainThreadScheduler.cpp 1262 1262 plugins/PluginViewNone.cpp 1263 plugins/npapi.cpp1264 1263 1265 1264 rendering/AutoTableLayout.cpp … … 1733 1732 SOURCE_GROUP(xml "xml/") 1734 1733 1734 SET(WebCore_LINK_FLAGS "") 1735 1735 INCLUDE_IF_EXISTS(${WEBCORE_DIR}/CMakeLists${PORT}.txt) 1736 1736 … … 1739 1739 ADD_LIBRARY(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES}) 1740 1740 TARGET_LINK_LIBRARIES(${WebCore_LIBRARY_NAME} ${WebCore_LIBRARIES}) 1741 1742 INSTALL(TARGETS ${WebCore_LIBRARY_NAME} DESTINATION lib) 1741 ADD_TARGET_PROPERTIES(${WebCore_LIBRARY_NAME} LINK_FLAGS ${WebCore_LINK_FLAGS}) 1742 1743 1744 IF (SHARED_CORE) 1745 INSTALL(TARGETS ${WebCore_LIBRARY_NAME} DESTINATION lib) 1746 ENDIF () -
trunk/WebCore/CMakeListsEfl.txt
r59537 r60909 1 LIST(APPEND WebCore_LINK_FLAGS 2 ${ECORE_X_LDFLAGS} 3 ${EFLDEPS_LDFLAGS} 4 ) 5 1 6 LIST(APPEND WebCore_INCLUDE_DIRECTORIES 2 7 "${JAVASCRIPTCORE_DIR}/wtf/gobject" -
trunk/WebCore/ChangeLog
r60908 r60909 1 2010-06-09 Leandro Pereira <leandro@profusion.mobi> 2 3 Reviewed by Adam Treat. 4 5 [EFL] Allow building core libraries as shared objects to speed up 6 linking time on machines with small amounts of memory. 7 http://webkit.org/b/39899 8 9 * CMakeLists.txt: If building with shared core, install the lib. 10 Remove npapi.cpp (causes conflicts when linking dynamically). 11 * CMakeListsEfl.txt: EFL libraries are needed to link dynamically. 12 1 13 2010-06-09 Mark Rowe <mrowe@apple.com> 2 14 -
trunk/cmake/FindGlib.cmake
r59537 r60909 30 30 PATHS ${Glib_PKGCONF_LIBRARY_DIRS} 31 31 ) 32 find_library(Gobject_LIBRARY 33 NAMES gobject-2.0 34 PATHS ${Glib_PKGCONF_LIBRARY_DIRS} 35 ) 32 36 33 37 # Set the include dir variables and the libraries and let libfind_process do the rest. 34 38 # NOTE: Singular variables for this library, plural for libraries this this lib depends on. 35 39 set(Glib_PROCESS_INCLUDES Glib_INCLUDE_DIR GlibConfig_INCLUDE_DIR) 36 set(Glib_PROCESS_LIBS Glib_LIBRARY )40 set(Glib_PROCESS_LIBS Glib_LIBRARY Gobject_LIBRARY) 37 41 libfind_process(Glib) 38 42 -
trunk/cmake/OptionsEfl.cmake
r60011 r60909 51 51 SET(WebKit_LIBRARY_NAME ewebkit) 52 52 53 SET(WTF_LIBRARY_TYPE STATIC)54 SET(JavaScriptCore_LIBRARY_TYPE STATIC)55 SET(WebCore_LIBRARY_TYPE STATIC)56 SET(WebKit_LIBRARY_TYPE SHARED)57 58 53 WEBKIT_FEATURE(ENABLE_AS_IMAGE "Enable SVG as image" DEFAULT ON SVG) 59 54 WEBKIT_FEATURE(ENABLE_BLOB_SLICE "Enable blob slice" DEFAULT OFF) -
trunk/cmake/WebKitHelpers.cmake
r60011 r60909 7 7 SET(OLD_COMPILE_FLAGS "") 8 8 ENDIF () 9 SET_TARGET_PROPERTIES (${_target} PROPERTIES 10 COMPILE_FLAGS "-fno-exceptions -fstrict-aliasing -fvisibility=hidden ${OLD_COMPILE_FLAGS}") 9 IF (SHARED_CORE) 10 SET_TARGET_PROPERTIES (${_target} PROPERTIES 11 COMPILE_FLAGS "-fno-exceptions -fstrict-aliasing ${OLD_COMPILE_FLAGS}") 12 ELSE () 13 SET_TARGET_PROPERTIES (${_target} PROPERTIES 14 COMPILE_FLAGS "-fno-exceptions -fstrict-aliasing -fvisibility=hidden ${OLD_COMPILE_FLAGS}") 15 ENDIF () 11 16 UNSET(OLD_COMPILE_FLAGS) 12 17 ENDIF ()
Note: See TracChangeset
for help on using the changeset viewer.