Changeset 160994 in webkit
- Timestamp:
- Dec 23, 2013 6:45:44 AM (10 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
-
ChangeLog (modified) (1 diff)
-
Source/JavaScriptCore/CMakeLists.txt (modified) (1 diff)
-
Source/JavaScriptCore/ChangeLog (modified) (1 diff)
-
Source/WebKit/CMakeLists.txt (modified) (1 diff)
-
Source/WebKit/ChangeLog (modified) (1 diff)
-
Source/WebKit2/CMakeLists.txt (modified) (1 diff)
-
Source/WebKit2/ChangeLog (modified) (1 diff)
-
Source/cmake/OptionsGTK.cmake (modified) (2 diffs)
-
Source/cmake/WebKitHelpers.cmake (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r160993 r160994 1 2013-12-22 Martin Robinson <mrobinson@igalia.com> 2 3 https://bugs.webkit.org/show_bug.cgi?id=125511 4 5 [GTK][CMake] libtool-compatible soversion calculation 6 Reviewed by Gustavo Noronha Silva. 7 8 * Source/cmake/OptionsGTK.cmake: Specify the appropriate libtool triples and use 9 the CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE macro to specify the library-specific 10 version information. 11 * Source/cmake/WebKitHelpers.cmake: Add some helpful macros. 12 1 13 2013-12-23 Gustavo Noronha Silva <gns@gnome.org> 2 14 -
trunk/Source/JavaScriptCore/CMakeLists.txt
r160812 r160994 763 763 764 764 if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "SHARED_LIBRARY") 765 set_target_properties(JavaScriptCore PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}) 765 POPULATE_LIBRARY_VERSION(JAVASCRIPTCORE) 766 set_target_properties(JavaScriptCore PROPERTIES VERSION ${JAVASCRIPTCORE_VERSION} SOVERSION ${JAVASCRIPTCORE_VERSION_MAJOR}) 766 767 install(TARGETS JavaScriptCore DESTINATION "${LIB_INSTALL_DIR}") 767 768 endif () -
trunk/Source/JavaScriptCore/ChangeLog
r160993 r160994 1 2013-12-22 Martin Robinson <mrobinson@igalia.com> 2 3 [GTK][CMake] libtool-compatible soversion calculation 4 https://bugs.webkit.org/show_bug.cgi?id=125511 5 6 Reviewed by Gustavo Noronha Silva. 7 8 * CMakeLists.txt: Use the POPULATE_LIBRARY_VERSION macro and the 9 library-specific version information. 10 1 11 2013-12-23 Gustavo Noronha Silva <gns@gnome.org> 2 12 -
trunk/Source/WebKit/CMakeLists.txt
r160984 r160994 118 118 endif () 119 119 120 set_target_properties(WebKit PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}) 120 POPULATE_LIBRARY_VERSION(WEBKIT) 121 set_target_properties(WebKit PROPERTIES VERSION ${WEBKIT_VERSION} SOVERSION ${WEBKIT_VERSION_MAJOR}) 121 122 install(TARGETS WebKit DESTINATION "${LIB_INSTALL_DIR}") -
trunk/Source/WebKit/ChangeLog
r160993 r160994 1 2013-12-22 Martin Robinson <mrobinson@igalia.com> 2 3 [GTK][CMake] libtool-compatible soversion calculation 4 https://bugs.webkit.org/show_bug.cgi?id=125511 5 6 Reviewed by Gustavo Noronha Silva. 7 8 * CMakeLists.txt: Use the POPULATE_LIBRARY_VERSION macro and the 9 library-specific version information. 10 1 11 2013-12-23 Gustavo Noronha Silva <gns@gnome.org> 2 12 -
trunk/Source/WebKit2/CMakeLists.txt
r160972 r160994 708 708 endif () 709 709 710 set_target_properties(WebKit2 PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}) 710 POPULATE_LIBRARY_VERSION(WEBKIT2) 711 set_target_properties(WebKit2 PROPERTIES VERSION ${WEBKIT2_VERSION} SOVERSION ${WEBKIT2_VERSION_MAJOR}) 711 712 712 713 install(TARGETS WebKit2 DESTINATION "${LIB_INSTALL_DIR}") -
trunk/Source/WebKit2/ChangeLog
r160993 r160994 1 2013-12-22 Martin Robinson <mrobinson@igalia.com> 2 3 [GTK][CMake] libtool-compatible soversion calculation 4 https://bugs.webkit.org/show_bug.cgi?id=125511 5 6 Reviewed by Gustavo Noronha Silva. 7 8 * CMakeLists.txt: Use the POPULATE_LIBRARY_VERSION macro and the 9 library-specific version information. 10 1 11 2013-12-23 Gustavo Noronha Silva <gns@gnome.org> 2 12 -
trunk/Source/cmake/OptionsGTK.cmake
r160993 r160994 1 1 include(GNUInstallDirs) 2 3 set(PROJECT_VERSION_MAJOR 2) 4 set(PROJECT_VERSION_MINOR 3) 5 set(PROJECT_VERSION_PATCH 3) 6 set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}) 7 8 # Libtool library version, not to be confused with API version. 9 # See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html 10 CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT 22 0 22) 11 CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 32 0 7) 12 CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 16 2 16) 13 14 # This is a little confusing: WEBKIT_MICRO_VERSION and friends are used as 15 # macros in files like WebKitVersion.h.in to expose the project version to 16 # the API. Meanwhile WEBKIT_VERSION_MICRO (note the transposed words) is used 17 # by the CMake files to hold the *library* version number, which we calculated 18 # from the libtool triple above. We should consider ditching these below 19 # and using PROJECT_VERSION_* directly. 20 set(WEBKIT_MICRO_VERSION ${PROJECT_VERSION_PATCH}) 21 set(WEBKIT_MINOR_VERSION ${PROJECT_VERSION_MINOR}) 22 set(WEBKIT_MAJOR_VERSION ${PROJECT_VERSION_MAJOR}) 2 23 3 24 # FIXME: We want to expose fewer options to downstream, but for now everything is public. … … 59 80 endif () 60 81 WEBKIT_OPTION_END() 61 62 set(PROJECT_VERSION_MAJOR 2)63 set(PROJECT_VERSION_MINOR 3)64 set(PROJECT_VERSION_PATCH 3)65 set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})66 67 set(WEBKIT_MICRO_VERSION ${PROJECT_VERSION_PATCH})68 set(WEBKIT_MINOR_VERSION ${PROJECT_VERSION_MINOR})69 set(WEBKIT_MAJOR_VERSION ${PROJECT_VERSION_MAJOR})70 82 71 83 # These are used to generate the pkg-config files, note we only support GTK 3.0 -
trunk/Source/cmake/WebKitHelpers.cmake
r160812 r160994 101 101 unset(_tmp) 102 102 endmacro() 103 104 macro(CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE library_name current revision age) 105 math(EXPR ${library_name}_VERSION_MAJOR "${current} - ${age}") 106 set(${library_name}_VERSION_MINOR ${age}) 107 set(${library_name}_VERSION_PATCH ${revision}) 108 set(${library_name}_VERSION ${${library_name}_VERSION_MAJOR}.${age}.${revision}) 109 endmacro() 110 111 macro(POPULATE_LIBRARY_VERSION library_name) 112 if (NOT DEFINED ${library_name}_VERSION_MAJOR) 113 set(${library_name}_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) 114 endif () 115 if (NOT DEFINED ${library_name}_VERSION_MINOR) 116 set(${library_name}_VERSION_MINOR ${PROJECT_VERSION_MINOR}) 117 endif () 118 if (NOT DEFINED ${library_name}_VERSION_PATCH) 119 set(${library_name}_VERSION_PATCH ${PROJECT_VERSION_PATCH}) 120 endif () 121 if (NOT DEFINED ${library_name}_VERSION) 122 set(${library_name}_VERSION ${PROJECT_VERSION}) 123 endif () 124 endmacro()
Note: See TracChangeset
for help on using the changeset viewer.
