Changeset 199289 in webkit


Ignore:
Timestamp:
Apr 11, 2016 12:28:42 AM (8 years ago)
Author:
commit-queue@webkit.org
Message:

[CMake] Make FOLDER property INHERITED
​https://bugs.webkit.org/show_bug.cgi?id=156460

Patch by Fujii Hironori <​Hironori.Fujii@jp.sony.com> on 2016-04-11
Reviewed by Brent Fulgham.

.:

Some CMake targets are not setting the FOLDER property. This causes the
generated projects to be displayed in the top-level folder of the solution.

Making the FOLDER property INHERITED ensures that all the targets
are placed in their proper directories.

  • Source/cmake/OptionsCommon.cmake:

Define FOLDER property as a inherited property.

  • Source/cmake/WebKitMacros.cmake:

Do not set FOLDER target property.

Source/bmalloc:

  • CMakeLists.txt:

Set FOLDER property as a directory property not a target property

Source/JavaScriptCore:

  • CMakeLists.txt:
  • shell/CMakeLists.txt:
  • shell/PlatformWin.cmake:

Set FOLDER property as a directory property not a target property

Source/ThirdParty/ANGLE:

  • CMakeLists.txt:

Set FOLDER property as a directory property not a target property

Source/WebCore:

  • CMakeLists.txt:

Set FOLDER property as a directory property not a target property

Source/WebKit:

  • CMakeLists.txt:
  • PlatformWin.cmake:

Set FOLDER property as a directory property not a target property

Source/WebKit2:

  • CMakeLists.txt:

Set FOLDER property as a directory property not a target property

Source/WTF:

  • CMakeLists.txt:

Set FOLDER directory property

Tools:

  • CMakeLists.txt:
  • DumpRenderTree/CMakeLists.txt:
  • DumpRenderTree/PlatformWin.cmake:
  • ImageDiff/CMakeLists.txt:
  • MiniBrowser/efl/CMakeLists.txt:
  • MiniBrowser/gtk/CMakeLists.txt:
  • MiniBrowser/win/CMakeLists.txt:

Set FOLDER property as a directory property not a target property

Location:
trunk
Files:
28 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r199257 r199289  
     12016-04-11  Fujii Hironori  <Hironori.Fujii@jp.sony.com>
     2
     3        [CMake] Make FOLDER property INHERITED
     4        https://bugs.webkit.org/show_bug.cgi?id=156460
     5
     6        Reviewed by Brent Fulgham.
     7
     8        Some CMake targets are not setting the FOLDER property. This causes the
     9        generated projects to be displayed in the top-level folder of the solution.
     10
     11        Making the FOLDER property INHERITED ensures that all the targets
     12        are placed in their proper directories.
     13
     14        * Source/cmake/OptionsCommon.cmake:
     15        Define FOLDER property as a inherited property.
     16        * Source/cmake/WebKitMacros.cmake:
     17        Do not set FOLDER target property.
     18
    1192016-04-08  Alex Christensen  <achristensen@webkit.org>
    220

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r199176 r199289  
    11cmake_minimum_required(VERSION 2.8.12)
    22include(WebKitCommon)
     3set_property(DIRECTORY . PROPERTY FOLDER "JavaScriptCore")
    34
    45set(JavaScriptCore_INCLUDE_DIRECTORIES

  • trunk/Source/JavaScriptCore/ChangeLog

    r199279 r199289  
     12016-04-11  Fujii Hironori  <Hironori.Fujii@jp.sony.com>
     2
     3        [CMake] Make FOLDER property INHERITED
     4        https://bugs.webkit.org/show_bug.cgi?id=156460
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * CMakeLists.txt:
     9        * shell/CMakeLists.txt:
     10        * shell/PlatformWin.cmake:
     11        Set FOLDER property as a directory property not a target property
     12
    1132016-04-09  Keith Miller  <keith_miller@apple.com>
    214

  • trunk/Source/JavaScriptCore/shell/CMakeLists.txt

    r195232 r199289  
    2424add_executable(jsc ${JSC_SOURCES})
    2525target_link_libraries(jsc ${JSC_LIBRARIES})
    26 set_target_properties(jsc PROPERTIES FOLDER "JavaScriptCore")
    2726
    2827if (JSC_OUTPUT_NAME)

  • trunk/Source/JavaScriptCore/shell/PlatformWin.cmake

    r197983 r199289  
    88
    99target_link_libraries(jscLib ${JSC_LIBRARIES})
    10 set_target_properties(jscLib PROPERTIES FOLDER "JavaScriptCore")
    1110
    1211if (${WTF_PLATFORM_WIN_CAIRO})
    … …  
    2120
    2221add_library(testRegExpLib SHARED ../testRegExp.cpp)
    23 set_target_properties(testRegExpLib PROPERTIES FOLDER "JavaScriptCore")
    2422add_executable(testRegExp ${JSC_SOURCES})
    2523set_target_properties(testRegExp PROPERTIES OUTPUT_NAME "testRegExp${DEBUG_SUFFIX}")
    … …  
    3937set_source_files_properties(../API/tests/CustomGlobalObjectClassTest.c PROPERTIES COMPILE_FLAGS "/TP /MT")
    4038set_source_files_properties(../API/tests/testapi.c PROPERTIES COMPILE_FLAGS "/TP /MT")
    41 set_target_properties(testapiLib PROPERTIES FOLDER "JavaScriptCore")
    4239add_executable(testapi ${JSC_SOURCES})
    4340set_target_properties(testapi PROPERTIES OUTPUT_NAME "testapi${DEBUG_SUFFIX}")

  • trunk/Source/ThirdParty/ANGLE/CMakeLists.txt

    r188694 r199289  
    304304endforeach ()
    305305
    306 set_target_properties(libANGLE PROPERTIES FOLDER "ANGLE")
    307 set_target_properties(libEGL PROPERTIES FOLDER "ANGLE")
    308 set_target_properties(libGLESv2 PROPERTIES FOLDER "ANGLE")
     306set_property(DIRECTORY . PROPERTY FOLDER "ANGLE")

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r198527 r199289  
     12016-04-11  Fujii Hironori  <Hironori.Fujii@jp.sony.com>
     2
     3        [CMake] Make FOLDER property INHERITED
     4        https://bugs.webkit.org/show_bug.cgi?id=156460
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * CMakeLists.txt:
     9        Set FOLDER property as a directory property not a target property
     10
    1112016-03-22  Alberto Garcia  <berto@igalia.com>
    212

  • trunk/Source/WTF/CMakeLists.txt

    r188540 r199289  
    11cmake_minimum_required(VERSION 2.8.12)
    22include(WebKitCommon)
     3set_property(DIRECTORY . PROPERTY FOLDER "WTF")
    34
    45add_subdirectory(wtf)

  • trunk/Source/WTF/ChangeLog

    r199257 r199289  
     12016-04-11  Fujii Hironori  <Hironori.Fujii@jp.sony.com>
     2
     3        [CMake] Make FOLDER property INHERITED
     4        https://bugs.webkit.org/show_bug.cgi?id=156460
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * CMakeLists.txt:
     9        Set FOLDER directory property
     10
    1112016-04-08  Alex Christensen  <achristensen@webkit.org>
    212

  • trunk/Source/WebCore/CMakeLists.txt

    r199257 r199289  
    11cmake_minimum_required(VERSION 2.8.12)
    22include(WebKitCommon)
     3set_property(DIRECTORY . PROPERTY FOLDER "WebCore")
    34
    45set(WebCore_INCLUDE_DIRECTORIES
    … …  
    38073808add_library(WebCoreDerivedSources STATIC ${WebCore_DERIVED_SOURCES})
    38083809set_target_properties(WebCoreDerivedSources PROPERTIES OUTPUT_NAME WebCoreDerivedSources${DEBUG_SUFFIX})
    3809 set_target_properties(WebCoreDerivedSources PROPERTIES FOLDER "WebCore")
    38103810if (NOT WIN32)
    38113811    list(APPEND WebCore_LIBRARIES WebCoreDerivedSources)
    … …  
    38403840add_dependencies(WebCoreTestSupport WebCore)
    38413841target_link_libraries(WebCoreTestSupport ${WebCoreTestSupport_LIBRARIES})
    3842 set_target_properties(WebCoreTestSupport PROPERTIES FOLDER "WebCore")
    38433842
    38443843if (WebCoreTestSupport_OUTPUT_NAME)
    … …  
    38513850if (ENABLE_GRAPHICS_CONTEXT_3D AND NOT WIN32)
    38523851    add_library(ANGLESupport STATIC ${ANGLESupport_SOURCES})
    3853     set_target_properties(ANGLESupport PROPERTIES FOLDER "WebCore")
    38543852
    38553853    # Suppress null conversion warnings for sources in Source/ThirdParty/ANGLE

  • trunk/Source/WebCore/ChangeLog

    r199287 r199289  
     12016-04-11  Fujii Hironori  <Hironori.Fujii@jp.sony.com>
     2
     3        [CMake] Make FOLDER property INHERITED
     4        https://bugs.webkit.org/show_bug.cgi?id=156460
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * CMakeLists.txt:
     9        Set FOLDER property as a directory property not a target property
     10
    1112016-04-10  Sam Weinig  <sam@webkit.org>
    212

  • trunk/Source/WebKit/CMakeLists.txt

    r199257 r199289  
    11cmake_minimum_required(VERSION 2.8.12)
    22include(WebKitCommon)
     3set_property(DIRECTORY . PROPERTY FOLDER "WebKit")
    34
    45set(WebKit_SOURCES

  • trunk/Source/WebKit/ChangeLog

    r199257 r199289  
     12016-04-11  Fujii Hironori  <Hironori.Fujii@jp.sony.com>
     2
     3        [CMake] Make FOLDER property INHERITED
     4        https://bugs.webkit.org/show_bug.cgi?id=156460
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * CMakeLists.txt:
     9        * PlatformWin.cmake:
     10        Set FOLDER property as a directory property not a target property
     11
    1122016-04-08  Alex Christensen  <achristensen@webkit.org>
    213

  • trunk/Source/WebKit/PlatformWin.cmake

    r199257 r199289  
    410410)
    411411set_target_properties(WebKitGUID PROPERTIES OUTPUT_NAME WebKitGUID${DEBUG_SUFFIX})
    412 set_target_properties(WebKitGUID PROPERTIES FOLDER "WebKit")
    413412
    414413list(APPEND WebKit_LIBRARIES

  • trunk/Source/WebKit2/CMakeLists.txt

    r199257 r199289  
     1set_property(DIRECTORY . PROPERTY FOLDER "WebKit2")
     2
    13set(WebKit2_INCLUDE_DIRECTORIES
    24    "${JAVASCRIPTCORE_DIR}/llint"
    … …  
    854856add_webkit2_prefix_header(WebProcess)
    855857target_link_libraries(WebProcess ${WebProcess_LIBRARIES})
    856 set_target_properties(WebProcess PROPERTIES FOLDER "WebKit")
    857858
    858859if (WebKit2_WebProcess_OUTPUT_NAME)
    … …  
    863864add_webkit2_prefix_header(NetworkProcess)
    864865target_link_libraries(NetworkProcess ${NetworkProcess_LIBRARIES})
    865 set_target_properties(NetworkProcess PROPERTIES FOLDER "WebKit")
    866866
    867867if (WebKit2_NetworkProcess_OUTPUT_NAME)
    … …  
    874874    add_webkit2_prefix_header(PluginProcess)
    875875    target_link_libraries(PluginProcess ${PluginProcess_LIBRARIES})
    876     set_target_properties(PluginProcess PROPERTIES FOLDER "WebKit")
    877876    install(TARGETS PluginProcess DESTINATION "${LIBEXEC_INSTALL_DIR}")
    878877
    … …  
    887886    add_webkit2_prefix_header(DatabaseProcess)
    888887    target_link_libraries(DatabaseProcess ${DatabaseProcess_LIBRARIES})
    889     set_target_properties(DatabaseProcess PROPERTIES FOLDER "WebKit")
    890888    install(TARGETS DatabaseProcess DESTINATION "${LIBEXEC_INSTALL_DIR}")
    891889

  • trunk/Source/WebKit2/ChangeLog

    r199286 r199289  
     12016-04-11  Fujii Hironori  <Hironori.Fujii@jp.sony.com>
     2
     3        [CMake] Make FOLDER property INHERITED
     4        https://bugs.webkit.org/show_bug.cgi?id=156460
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * CMakeLists.txt:
     9        Set FOLDER property as a directory property not a target property
     10
    1112016-04-08  Sam Weinig  <sam@webkit.org>
    212

  • trunk/Source/bmalloc/CMakeLists.txt

    r198809 r199289  
     1set_property(DIRECTORY . PROPERTY FOLDER "bmalloc")
     2
    13set(bmalloc_INCLUDE_DIRECTORIES
    24    "${BMALLOC_DIR}"

  • trunk/Source/bmalloc/ChangeLog

    r199246 r199289  
     12016-04-11  Fujii Hironori  <Hironori.Fujii@jp.sony.com>
     2
     3        [CMake] Make FOLDER property INHERITED
     4        https://bugs.webkit.org/show_bug.cgi?id=156460
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * CMakeLists.txt:
     9        Set FOLDER property as a directory property not a target property
     10
    1112016-04-08  Geoffrey Garen  <ggaren@apple.com>
    212

  • trunk/Source/cmake/OptionsCommon.cmake

    r196749 r199289  
    2525
    2626set_property(GLOBAL PROPERTY USE_FOLDERS ON)
     27define_property(TARGET PROPERTY FOLDER INHERITED BRIEF_DOCS "folder" FULL_DOCS "IDE folder name")
    2728
    2829if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")

  • trunk/Source/cmake/WebKitMacros.cmake

    r199257 r199289  
    253253    target_link_libraries(${_target} ${${_target}_LIBRARIES})
    254254    set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")
    255     set_target_properties(${_target} PROPERTIES FOLDER "${_target}")
    256255
    257256    if (${_target}_OUTPUT_NAME)

  • trunk/Tools/CMakeLists.txt

    r199118 r199289  
     1set_property(DIRECTORY . PROPERTY FOLDER "Tools")
     2
    13if ("${PORT}" STREQUAL "Efl")
    24    if (DEVELOPER_MODE)

  • trunk/Tools/ChangeLog

    r199288 r199289  
     12016-04-11  Fujii Hironori  <Hironori.Fujii@jp.sony.com>
     2
     3        [CMake] Make FOLDER property INHERITED
     4        https://bugs.webkit.org/show_bug.cgi?id=156460
     5
     6        Reviewed by Brent Fulgham.
     7
     8        * CMakeLists.txt:
     9        * DumpRenderTree/CMakeLists.txt:
     10        * DumpRenderTree/PlatformWin.cmake:
     11        * ImageDiff/CMakeLists.txt:
     12        * MiniBrowser/efl/CMakeLists.txt:
     13        * MiniBrowser/gtk/CMakeLists.txt:
     14        * MiniBrowser/win/CMakeLists.txt:
     15        Set FOLDER property as a directory property not a target property
     16
    1172016-04-10  Caitlin Potter  <caitp@igalia.com>
    218

  • trunk/Tools/DumpRenderTree/CMakeLists.txt

    r199094 r199289  
    111111add_executable(DumpRenderTree ${DumpRenderTree_SOURCES})
    112112target_link_libraries(DumpRenderTree ${DumpRenderTree_LIBRARIES})
    113 set_target_properties(DumpRenderTree PROPERTIES FOLDER "Tools")
    114113
    115114add_library(TestNetscapePlugin SHARED ${TestNetscapePlugin_SOURCES})
    116115target_link_libraries(TestNetscapePlugin ${TestNetscapePlugin_LIBRARIES})
    117 set_target_properties(TestNetscapePlugin PROPERTIES FOLDER "Tools")
    118116
    119117if (WIN32)

  • trunk/Tools/DumpRenderTree/PlatformWin.cmake

    r199094 r199289  
    130130
    131131add_library(DumpRenderTreeLib SHARED ${DumpRenderTreeLib_SOURCES})
    132 set_target_properties(DumpRenderTreeLib PROPERTIES FOLDER "Tools")
    133132target_link_libraries(DumpRenderTreeLib ${DumpRenderTreeLib_LIBRARIES})
    134133
    135134add_executable(ImageDiff ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp)
    136135target_link_libraries(ImageDiff shlwapi)
    137 set_target_properties(ImageDiff PROPERTIES FOLDER "Tools")
    138136set_target_properties(ImageDiff PROPERTIES OUTPUT_NAME "ImageDiff")
    139137
    140138add_library(ImageDiffLib SHARED ${ImageDiff_SOURCES})
    141 set_target_properties(ImageDiffLib PROPERTIES FOLDER "Tools")
    142139target_link_libraries(ImageDiffLib ${ImageDiff_LIBRARIES})
    143140

  • trunk/Tools/ImageDiff/CMakeLists.txt

    r185806 r199289  
    1818add_executable(ImageDiff ${IMAGE_DIFF_SOURCES})
    1919target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES})
    20 set_target_properties(ImageDiff PROPERTIES FOLDER "Tools")

  • trunk/Tools/MiniBrowser/efl/CMakeLists.txt

    r185806 r199289  
    6868    add_executable(MiniBrowser ${MiniBrowser_SOURCES})
    6969    target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
    70     set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools")
    7170endif ()

  • trunk/Tools/MiniBrowser/gtk/CMakeLists.txt

    r185806 r199289  
    5959add_executable(MiniBrowser ${MiniBrowser_SOURCES})
    6060target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
    61 set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools")
    6261
    6362install(TARGETS MiniBrowser DESTINATION "${EXEC_INSTALL_DIR}")

  • trunk/Tools/MiniBrowser/win/CMakeLists.txt

    r196589 r199289  
    5454add_library(MiniBrowserLib SHARED ${MiniBrowser_SOURCES})
    5555target_link_libraries(MiniBrowserLib ${MiniBrowser_LIBRARIES})
    56 set_target_properties(MiniBrowserLib PROPERTIES FOLDER "Tools")
    5756
    5857add_executable(MiniBrowser WIN32 ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp ../MiniBrowser.vcxproj/MiniBrowser.rc)
    5958target_link_libraries(MiniBrowser shlwapi)
    60 set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools")
    6159set_target_properties(MiniBrowser PROPERTIES OUTPUT_NAME "MiniBrowser")
    6260
Note: See TracChangeset for help on using the changeset viewer.