Changeset 196947 in webkit


Ignore:
Timestamp:
Feb 22, 2016 11:32:47 AM (8 years ago)
Author:
commit-queue@webkit.org
Message:

[cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
​https://bugs.webkit.org/show_bug.cgi?id=154450

Patch by Konstantin Tokarev <Konstantin Tokarev> on 2016-02-22
Reviewed by Alex Christensen.

.:

  • Source/cmake/WebKitMacros.cmake:

Source/JavaScriptCore:

  • CMakeLists.txt:

Source/WebCore:

No new tests needed.

  • CMakeLists.txt:

Source/WebKit:

  • CMakeLists.txt:

Source/WebKit2:

  • CMakeLists.txt: Used WebKit2_SOURCES variable instead of separate

WebKit2_DERIVED_SOURCES for compatibility with WEBKIT_FRAMEWORK macro.
There is no real need to separate derived sources from others.

  • PlatformGTK.cmake: Ditto.

Source/WTF:

  • wtf/CMakeLists.txt:
Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r196804 r196947  
     12016-02-22  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
     4        https://bugs.webkit.org/show_bug.cgi?id=154450
     5
     6        Reviewed by Alex Christensen.
     7
     8        * Source/cmake/WebKitMacros.cmake:
     9
    1102016-02-18  Philippe Normand  <pnormand@igalia.com>
    211

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r196758 r196947  
    13111311
    13121312WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES})
    1313 include_directories(${JavaScriptCore_INCLUDE_DIRECTORIES})
    1314 include_directories(SYSTEM ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES})
    1315 add_library(JavaScriptCore ${JavaScriptCore_LIBRARY_TYPE} ${JavaScriptCore_HEADERS} ${JavaScriptCore_SOURCES})
    1316 target_link_libraries(JavaScriptCore ${JavaScriptCore_LIBRARIES})
    1317 set_target_properties(JavaScriptCore PROPERTIES COMPILE_DEFINITIONS "BUILDING_JavaScriptCore")
    1318 set_target_properties(JavaScriptCore PROPERTIES FOLDER "JavaScriptCore")
     1313WEBKIT_FRAMEWORK(JavaScriptCore)
    13191314
    13201315if (JavaScriptCore_PRE_BUILD_COMMAND)
    … …  
    13241319if (JavaScriptCore_POST_BUILD_COMMAND)
    13251320    add_custom_command(TARGET JavaScriptCore POST_BUILD COMMAND ${JavaScriptCore_POST_BUILD_COMMAND} VERBATIM)
    1326 endif ()
    1327 
    1328 if (JavaScriptCore_OUTPUT_NAME)
    1329     set_target_properties(JavaScriptCore PROPERTIES OUTPUT_NAME ${JavaScriptCore_OUTPUT_NAME})
    13301321endif ()
    13311322
    … …  
    13401331add_custom_target(stageSharedScripts DEPENDS ${JavaScriptCore_SCRIPTS})
    13411332add_dependencies(JavaScriptCore stageSharedScripts)
    1342 
    1343 WEBKIT_FRAMEWORK(JavaScriptCore)

  • trunk/Source/JavaScriptCore/ChangeLog

    r196937 r196947  
     12016-02-22  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
     4        https://bugs.webkit.org/show_bug.cgi?id=154450
     5
     6        Reviewed by Alex Christensen.
     7
     8        * CMakeLists.txt:
     9
    1102016-02-22  Commit Queue  <commit-queue@webkit.org>
    211

  • trunk/Source/WTF/ChangeLog

    r196871 r196947  
     12016-02-22  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
     4        https://bugs.webkit.org/show_bug.cgi?id=154450
     5
     6        Reviewed by Alex Christensen.
     7
     8        * wtf/CMakeLists.txt:
     9
    1102016-02-20  Mark Lam  <mark.lam@apple.com>
    211

  • trunk/Source/WTF/wtf/CMakeLists.txt

    r195585 r196947  
    285285
    286286WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
    287 include_directories(${WTF_INCLUDE_DIRECTORIES})
    288 include_directories(SYSTEM ${WTF_SYSTEM_INCLUDE_DIRECTORIES})
    289 add_library(WTF ${WTF_LIBRARY_TYPE} ${WTF_HEADERS} ${WTF_SOURCES})
    290 target_link_libraries(WTF ${WTF_LIBRARIES})
    291 set_target_properties(WTF PROPERTIES COMPILE_DEFINITIONS "BUILDING_WTF")
    292 set_target_properties(WTF PROPERTIES FOLDER "JavaScriptCore")
     287WEBKIT_FRAMEWORK(WTF)
    293288
    294289if (MSVC)
    … …  
    300295    add_custom_command(TARGET WTF PRE_BUILD COMMAND ${WTF_PRE_BUILD_COMMAND} VERBATIM)
    301296endif ()
    302 
    303 if (WTF_OUTPUT_NAME)
    304     set_target_properties(WTF PROPERTIES OUTPUT_NAME ${WTF_OUTPUT_NAME})
    305 endif ()
    306 
    307 WEBKIT_FRAMEWORK(WTF)

  • trunk/Source/WebCore/CMakeLists.txt

    r196900 r196947  
    37723772WEBKIT_WRAP_SOURCELIST(${WebCoreTestSupport_IDL_FILES} ${WebCoreTestSupport_SOURCES})
    37733773
    3774 include_directories(${WebCore_INCLUDE_DIRECTORIES} ${WebCoreTestSupport_INCLUDE_DIRECTORIES})
    3775 include_directories(SYSTEM ${WebCore_SYSTEM_INCLUDE_DIRECTORIES})
    3776 
    37773774if (MSVC)
    37783775    ADD_PRECOMPILED_HEADER("WebCorePrefix.h" "WebCorePrefix.cpp" WebCore_SOURCES)
    37793776endif ()
    37803777
    3781 add_library(WebCore ${WebCore_LIBRARY_TYPE} ${WebCore_SOURCES})
    3782 set_target_properties(WebCore PROPERTIES COMPILE_DEFINITIONS "BUILDING_WebCore")
    3783 set_target_properties(WebCore PROPERTIES FOLDER "WebCore")
     3778WEBKIT_FRAMEWORK(WebCore)
    37843779
    37853780# The -ftree-sra optimization (implicit with -O2) causes crashes when
    … …  
    38003795endif ()
    38013796
    3802 if (WebCore_OUTPUT_NAME)
    3803     set_target_properties(WebCore PROPERTIES OUTPUT_NAME ${WebCore_OUTPUT_NAME})
    3804 endif ()
    3805 
    38063797if (MSVC)
    38073798    ADD_PRECOMPILED_HEADER("WebCoreTestSupportPrefix.h" "testing/js/WebCoreTestSupportPrefix.cpp" WebCoreTestSupport_SOURCES)
    38083799endif ()
    38093800
     3801include_directories(${WebCoreTestSupport_INCLUDE_DIRECTORIES})
    38103802add_library(WebCoreTestSupport ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
    38113803add_dependencies(WebCoreTestSupport WebCore)
    … …  
    38493841    set_source_files_properties(svg/SVGPathElement.cpp PROPERTIES COMPILE_FLAGS "-O2")
    38503842endif ()
    3851 
    3852 WEBKIT_FRAMEWORK(WebCore)

  • trunk/Source/WebCore/ChangeLog

    r196946 r196947  
     12016-02-22  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
     4        https://bugs.webkit.org/show_bug.cgi?id=154450
     5
     6        Reviewed by Alex Christensen.
     7
     8        No new tests needed.
     9
     10        * CMakeLists.txt:
     11
    1122016-02-22  Konstantin Tokarev  <annulen@yandex.ru>
    213

  • trunk/Source/WebKit/CMakeLists.txt

    r196377 r196947  
    2828WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
    2929
    30 include_directories(${WebKit_INCLUDE_DIRECTORIES})
    31 include_directories(SYSTEM ${WebKit_SYSTEM_INCLUDE_DIRECTORIES})
    32 
    3330if (MSVC)
    3431    ADD_PRECOMPILED_HEADER("WebKitPrefix.h" "win/WebKitPrefix.cpp" WebKit_SOURCES)
    … …  
    3734endif ()
    3835
    39 add_library(WebKit ${WebKit_LIBRARY_TYPE} ${WebKit_SOURCES})
     36WEBKIT_FRAMEWORK(WebKit)
     37
    4038add_dependencies(WebKit WebCore)
    4139if (WIN32)
    4240    add_dependencies(WebKit WebKitGUID)
    4341endif ()
    44 target_link_libraries(WebKit ${WebKit_LIBRARIES})
    45 set_target_properties(WebKit PROPERTIES FOLDER "WebKit")
    46 
    47 if (WebKit_OUTPUT_NAME)
    48     set_target_properties(WebKit PROPERTIES OUTPUT_NAME ${WebKit_OUTPUT_NAME})
    49 endif ()
    50 
    51 WEBKIT_FRAMEWORK(WebKit)

  • trunk/Source/WebKit/ChangeLog

    r196589 r196947  
     12016-02-22  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
     4        https://bugs.webkit.org/show_bug.cgi?id=154450
     5
     6        Reviewed by Alex Christensen.
     7
     8        * CMakeLists.txt:
     9
    1102016-02-15  Alex Christensen  <achristensen@webkit.org>
    211

  • trunk/Source/WebKit2/CMakeLists.txt

    r196945 r196947  
    771771GENERATE_WEBKIT2_MESSAGE_SOURCES(WebKit2_DERIVED_SOURCES "${WebKit2_MESSAGES_IN_FILES}")
    772772
    773 include_directories(${WebKit2_INCLUDE_DIRECTORIES})
    774 include_directories(SYSTEM ${WebKit2_SYSTEM_INCLUDE_DIRECTORIES})
    775 add_library(WebKit2 ${WebKit2_LIBRARY_TYPE} ${WebKit2_SOURCES} ${WebKit2_DERIVED_SOURCES})
    776 
     773WEBKIT_FRAMEWORK(WebKit2)
    777774add_dependencies(WebKit2 WebCore ${WEBKIT2_EXTRA_DEPENDENCIES})
    778775add_webkit2_prefix_header(WebKit2)
    779 target_link_libraries(WebKit2 ${WebKit2_LIBRARIES})
    780 set_target_properties(WebKit2 PROPERTIES FOLDER "WebKit")
    781776
    782777# Suppress unused parameter warnings for sources in WebKit2.
    … …  
    785780if (WebKit2_VERSION_SCRIPT)
    786781    ADD_TARGET_PROPERTIES(WebKit2 LINK_FLAGS "${WebKit2_VERSION_SCRIPT}")
    787 endif ()
    788 
    789 if (WebKit2_OUTPUT_NAME)
    790     set_target_properties(WebKit2 PROPERTIES OUTPUT_NAME ${WebKit2_OUTPUT_NAME})
    791782endif ()
    792783
    … …  
    838829set_target_properties(WebKit2 PROPERTIES VERSION ${WEBKIT2_VERSION} SOVERSION ${WEBKIT2_VERSION_MAJOR})
    839830
    840 if (APPLE)
    841     WEBKIT_FRAMEWORK(WebKit2)
    842 else ()
     831if (NOT APPLE)
    843832    install(TARGETS WebKit2 WebProcess NetworkProcess
    844833        LIBRARY DESTINATION "${LIB_INSTALL_DIR}"

  • trunk/Source/WebKit2/ChangeLog

    r196945 r196947  
     12016-02-22  Konstantin Tokarev  <annulen@yandex.ru>
     2
     3        [cmake] Moved library setup code to WEBKIT_FRAMEWORK macro.
     4        https://bugs.webkit.org/show_bug.cgi?id=154450
     5
     6        Reviewed by Alex Christensen.
     7
     8        * CMakeLists.txt: Used WebKit2_SOURCES variable instead of separate
     9        WebKit2_DERIVED_SOURCES for compatibility with WEBKIT_FRAMEWORK macro.
     10        There is no real need to separate derived sources from others.
     11        * PlatformGTK.cmake: Ditto.
     12
    1132016-02-22  Carlos Alberto Lopez Perez  <clopez@igalia.com>
    214

  • trunk/Source/cmake/WebKitMacros.cmake

    r195582 r196947  
    244244
    245245macro(WEBKIT_FRAMEWORK _target)
     246    include_directories(${${_target}_INCLUDE_DIRECTORIES})
     247    include_directories(SYSTEM ${${_target}_SYSTEM_INCLUDE_DIRECTORIES})
     248    add_library(${_target} ${${_target}_LIBRARY_TYPE}
     249        ${${_target}_HEADERS}
     250        ${${_target}_SOURCES}
     251        ${${_target}_DERIVED_SOURCES}
     252    )
     253    target_link_libraries(${_target} ${${_target}_LIBRARIES})
     254    set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")
     255    set_target_properties(${_target} PROPERTIES FOLDER "${_target}")
     256
     257    if (${_target}_OUTPUT_NAME)
     258        set_target_properties(${_target} PROPERTIES OUTPUT_NAME ${${_target}_OUTPUT_NAME})
     259    endif ()
     260
    246261    if (APPLE AND NOT PORT STREQUAL "GTK")
    247262        set_target_properties(${_target} PROPERTIES FRAMEWORK TRUE)
Note: See TracChangeset for help on using the changeset viewer.