Skip to content

Commit c87a7b3

Browse files
authored
[clang-tools-extra] Revise IDE folder structure (llvm#89744)
Update the folder titles for targets in the monorepository that have not seen taken care of for some time. These are the folders that targets are organized in Visual Studio and XCode (`set_property(TARGET <target> PROPERTY FOLDER "<title>")`) when using the respective CMake's IDE generator. * Ensure that every target is in a folder * Use a folder hierarchy with each LLVM subproject as a top-level folder * Use consistent folder names between subprojects * When using target-creating functions from AddLLVM.cmake, automatically deduce the folder. This reduces the number of `set_property`/`set_target_property`, but are still necessary when `add_custom_target`, `add_executable`, `add_library`, etc. are used. A LLVM_SUBPROJECT_TITLE definition is used for that in each subproject's root CMakeLists.txt.
1 parent faef8b4 commit c87a7b3

File tree

11 files changed

+12
-3
lines changed

11 files changed

+12
-3
lines changed

clang-tools-extra/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
set(LLVM_SUBPROJECT_TITLE "Clang Tools Extra")
2+
13
include(CMakeDependentOption)
24
include(GNUInstallDirs)
35

clang-tools-extra/clang-tidy/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
121121
PATTERN "*.h"
122122
)
123123
add_custom_target(clang-tidy-headers)
124-
set_target_properties(clang-tidy-headers PROPERTIES FOLDER "Misc")
124+
set_target_properties(clang-tidy-headers PROPERTIES FOLDER "Clang Tools Extra/Resources")
125125
if(NOT LLVM_ENABLE_IDE)
126126
add_llvm_install_targets(install-clang-tidy-headers
127127
DEPENDS clang-tidy-headers

clang-tools-extra/clang-tidy/misc/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ add_custom_command(
1515
DEPENDS ${clang_tidy_confusable_chars_gen_target} ConfusableTable/confusables.txt)
1616

1717
add_custom_target(genconfusable DEPENDS Confusables.inc)
18+
set_target_properties(genconfusable PROPERTIES FOLDER "Clang Tools Extra/Sourcegenning")
1819

1920
add_clang_library(clangTidyMiscModule
2021
ConstCorrectnessCheck.cpp
@@ -51,6 +52,7 @@ add_clang_library(clangTidyMiscModule
5152
genconfusable
5253
ClangDriverOptions
5354
)
55+
set_target_properties(clangTidyMiscModule PROPERTIES FOLDER "Clang Tools Extra/Libraries")
5456

5557
clang_target_link_libraries(clangTidyMiscModule
5658
PRIVATE

clang-tools-extra/clangd/unittests/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/../quality/CompletionModel.cmake)
2929
gen_decision_forest(${CMAKE_CURRENT_SOURCE_DIR}/decision_forest_model DecisionForestRuntimeTest ::ns1::ns2::test::Example)
3030

3131
add_custom_target(ClangdUnitTests)
32+
set_target_properties(ClangdUnitTests PROPERTIES FOLDER "Clang Tools Extra/Tests")
3233
add_unittest(ClangdUnitTests ClangdTests
3334
Annotations.cpp
3435
ASTTests.cpp

clang-tools-extra/docs/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ if (DOXYGEN_FOUND)
7777
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg
7878
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
7979
COMMENT "Generating clang doxygen documentation." VERBATIM)
80+
set_target_properties(doxygen-clang-tools PROPERTIES FOLDER "Clang Tools Extra/Docs")
8081

8182
if (LLVM_BUILD_DOCS)
8283
add_dependencies(doxygen doxygen-clang-tools)

clang-tools-extra/include-cleaner/unittests/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ set(LLVM_LINK_COMPONENTS
44
)
55

66
add_custom_target(ClangIncludeCleanerUnitTests)
7+
set_target_properties(ClangIncludeCleanerUnitTests PROPERTIES FOLDER "Clang Tools Extra/Tests")
78
add_unittest(ClangIncludeCleanerUnitTests ClangIncludeCleanerTests
89
AnalysisTest.cpp
910
FindHeadersTest.cpp

clang-tools-extra/pseudo/include/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,4 @@ add_custom_command(OUTPUT ${cxx_bnf_inc}
2929
add_custom_target(cxx_gen
3030
DEPENDS ${cxx_symbols_inc} ${cxx_bnf_inc}
3131
VERBATIM)
32+
set_target_properties(cxx_gen PROPERTIES FOLDER "Clang Tools Extra/Sourcegenning")

clang-tools-extra/pseudo/tool/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@ add_custom_command(OUTPUT HTMLForestResources.inc
2626
DEPENDS ${CLANG_SOURCE_DIR}/utils/bundle_resources.py HTMLForest.css HTMLForest.js HTMLForest.html
2727
VERBATIM)
2828
add_custom_target(clang-pseudo-resources DEPENDS HTMLForestResources.inc)
29+
set_target_properties(clang-pseudo-resources PROPERTIES FOLDER "Clang Tools Extra/Resources")
2930
add_dependencies(clang-pseudo clang-pseudo-resources)

clang-tools-extra/pseudo/unittests/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ set(LLVM_LINK_COMPONENTS
33
)
44

55
add_custom_target(ClangPseudoUnitTests)
6+
set_target_properties(ClangPseudoUnitTests PROPERTIES FOLDER "Clang Tools Extra/Tests")
67
add_unittest(ClangPseudoUnitTests ClangPseudoTests
78
BracketTest.cpp
89
CXXTest.cpp

clang-tools-extra/test/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ add_lit_testsuite(check-clang-extra "Running clang-tools-extra/test"
9797
${CMAKE_CURRENT_BINARY_DIR}
9898
DEPENDS ${CLANG_TOOLS_TEST_DEPS}
9999
)
100-
set_target_properties(check-clang-extra PROPERTIES FOLDER "Clang extra tools' tests")
101100

102101
add_lit_testsuites(CLANG-EXTRA ${CMAKE_CURRENT_SOURCE_DIR}
103102
DEPENDS ${CLANG_TOOLS_TEST_DEPS}

0 commit comments

Comments
 (0)