Skip to content

Commit f1e1293

Browse files
committed
Revise IDE FOLDER structure
1 parent 4cc9c6d commit f1e1293

File tree

187 files changed

+365
-274
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+365
-274
lines changed

bolt/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
set(LLVM_SUBPROJECT_TITLE "BOLT")
12
include(ExternalProject)
23

34
set(BOLT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})

bolt/cmake/modules/AddBOLT.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ include(LLVMDistributionSupport)
33

44
macro(add_bolt_executable name)
55
add_llvm_executable(${name} ${ARGN})
6-
set_target_properties(${name} PROPERTIES FOLDER "BOLT")
76
endmacro()
87

98
macro(add_bolt_tool name)

bolt/docs/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ if (LLVM_ENABLE_DOXYGEN)
7979
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg
8080
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
8181
COMMENT "Generating bolt doxygen documentation." VERBATIM)
82+
set_target_properties(doxygen-bolt PROPERTIES FOLDER "BOLT/Docs")
8283

8384
if (LLVM_BUILD_DOCS)
8485
add_dependencies(doxygen doxygen-bolt)

bolt/test/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,14 @@ list(APPEND BOLT_TEST_DEPS
5656
)
5757

5858
add_custom_target(bolt-test-depends DEPENDS ${BOLT_TEST_DEPS})
59-
set_target_properties(bolt-test-depends PROPERTIES FOLDER "BOLT")
59+
set_target_properties(bolt-test-depends PROPERTIES FOLDER "BOLT/Tests")
6060

6161
add_lit_testsuite(check-bolt "Running the BOLT regression tests"
6262
${CMAKE_CURRENT_BINARY_DIR}
6363
PARAMS ${BOLT_TEST_PARAMS}
6464
DEPENDS ${BOLT_TEST_DEPS}
6565
ARGS ${BOLT_TEST_EXTRA_ARGS}
6666
)
67-
set_target_properties(check-bolt PROPERTIES FOLDER "BOLT")
6867

6968
add_lit_testsuites(BOLT ${CMAKE_CURRENT_SOURCE_DIR}
7069
PARAMS ${BOLT_TEST_PARAMS}

bolt/unittests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
add_custom_target(BoltUnitTests)
2-
set_target_properties(BoltUnitTests PROPERTIES FOLDER "BOLT tests")
2+
set_target_properties(BoltUnitTests PROPERTIES FOLDER "BOLT/Tests")
33

44
function(add_bolt_unittest test_dirname)
55
add_unittest(BoltUnitTests ${test_dirname} ${ARGN})

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/Tablegenning")
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/Tablegenning")

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
@@ -100,7 +100,6 @@ add_lit_testsuite(check-clang-extra "Running clang-tools-extra/test"
100100
${CMAKE_CURRENT_BINARY_DIR}
101101
DEPENDS ${CLANG_TOOLS_TEST_DEPS}
102102
)
103-
set_target_properties(check-clang-extra PROPERTIES FOLDER "Clang extra tools' tests")
104103

105104
add_lit_testsuites(CLANG-EXTRA ${CMAKE_CURRENT_SOURCE_DIR}
106105
DEPENDS ${CLANG_TOOLS_TEST_DEPS}

clang-tools-extra/unittests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
add_custom_target(ExtraToolsUnitTests)
2-
set_target_properties(ExtraToolsUnitTests PROPERTIES FOLDER "Extra Tools Unit Tests")
2+
set_target_properties(ExtraToolsUnitTests PROPERTIES FOLDER "Clang Tools Extra/Tests")
33

44
function(add_extra_unittest test_dirname)
55
add_unittest(ExtraToolsUnitTests ${test_dirname} ${ARGN})

clang/CMakeLists.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
cmake_minimum_required(VERSION 3.20.0)
2+
set(LLVM_SUBPROJECT_TITLE "Clang")
23

34
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
45
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
@@ -390,14 +391,15 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
390391
# Installing the headers needs to depend on generating any public
391392
# tablegen'd headers.
392393
add_custom_target(clang-headers DEPENDS clang-tablegen-targets)
393-
set_target_properties(clang-headers PROPERTIES FOLDER "Misc")
394+
set_target_properties(clang-headers PROPERTIES FOLDER "Clang/Resources")
394395
if(NOT LLVM_ENABLE_IDE)
395396
add_llvm_install_targets(install-clang-headers
396397
DEPENDS clang-headers
397398
COMPONENT clang-headers)
398399
endif()
399400

400401
add_custom_target(bash-autocomplete DEPENDS utils/bash-autocomplete.sh)
402+
set_target_properties(bash-autocomplete PROPERTIES FOLDER "Clang/Misc")
401403
install(FILES utils/bash-autocomplete.sh
402404
DESTINATION "${CMAKE_INSTALL_DATADIR}/clang"
403405
COMPONENT bash-autocomplete)
@@ -478,7 +480,7 @@ add_custom_target(clang-tablegen-targets
478480
omp_gen
479481
ClangDriverOptions
480482
${CLANG_TABLEGEN_TARGETS})
481-
set_target_properties(clang-tablegen-targets PROPERTIES FOLDER "Misc")
483+
set_target_properties(clang-tablegen-targets PROPERTIES FOLDER "Clang/Misc")
482484
list(APPEND LLVM_COMMON_DEPENDS clang-tablegen-targets)
483485

484486
# Force target to be built as soon as possible. Clang modules builds depend
@@ -541,7 +543,7 @@ endif()
541543

542544
# Custom target to install all clang libraries.
543545
add_custom_target(clang-libraries)
544-
set_target_properties(clang-libraries PROPERTIES FOLDER "Misc")
546+
set_target_properties(clang-libraries PROPERTIES FOLDER "Clang/Meta")
545547

546548
if(NOT LLVM_ENABLE_IDE)
547549
add_llvm_install_targets(install-clang-libraries

clang/bindings/python/tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ add_custom_target(check-clang-python
1111
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/..)
1212

1313
set(RUN_PYTHON_TESTS TRUE)
14-
set_target_properties(check-clang-python PROPERTIES FOLDER "Clang tests")
14+
set_target_properties(check-clang-python PROPERTIES FOLDER "Clang/Tests")
1515

1616
# Tests require libclang.so which is only built with LLVM_ENABLE_PIC=ON
1717
if(NOT LLVM_ENABLE_PIC)

clang/cmake/modules/AddClang.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ function(clang_tablegen)
2626

2727
if(CTG_TARGET)
2828
add_public_tablegen_target(${CTG_TARGET})
29-
set_target_properties( ${CTG_TARGET} PROPERTIES FOLDER "Clang tablegenning")
3029
set_property(GLOBAL APPEND PROPERTY CLANG_TABLEGEN_TARGETS ${CTG_TARGET})
3130
endif()
3231
endfunction(clang_tablegen)
@@ -138,13 +137,11 @@ macro(add_clang_library name)
138137
endif()
139138
endforeach()
140139

141-
set_target_properties(${name} PROPERTIES FOLDER "Clang libraries")
142140
set_clang_windows_version_resource_properties(${name})
143141
endmacro(add_clang_library)
144142

145143
macro(add_clang_executable name)
146144
add_llvm_executable( ${name} ${ARGN} )
147-
set_target_properties(${name} PROPERTIES FOLDER "Clang executables")
148145
set_clang_windows_version_resource_properties(${name})
149146
endmacro(add_clang_executable)
150147

clang/docs/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ if (LLVM_ENABLE_DOXYGEN)
7878
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg
7979
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
8080
COMMENT "Generating clang doxygen documentation." VERBATIM)
81+
set_target_properties(doxygen-clang PROPERTIES FOLDER "Clang/Docs")
8182

8283
if (LLVM_BUILD_DOCS)
8384
add_dependencies(doxygen doxygen-clang)

clang/lib/Analysis/FlowSensitive/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ add_custom_command(OUTPUT HTMLLogger.inc
3636
DEPENDS ${CLANG_SOURCE_DIR}/utils/bundle_resources.py HTMLLogger.html HTMLLogger.css HTMLLogger.js
3737
VERBATIM)
3838
add_custom_target(clangAnalysisFlowSensitiveResources DEPENDS HTMLLogger.inc)
39+
set_target_properties(clangAnalysisFlowSensitiveResources PROPERTIES FOLDER "Clang/Misc")

clang/lib/Headers/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,14 +439,14 @@ endforeach( f )
439439
function(add_header_target target_name file_list)
440440
add_library(${target_name} INTERFACE ${file_list})
441441
set_target_properties(${target_name} PROPERTIES
442-
FOLDER "Misc"
442+
FOLDER "Clang/Resources"
443443
RUNTIME_OUTPUT_DIRECTORY "${output_dir}")
444444
endfunction()
445445

446446
# The catch-all clang-resource-headers target
447447
add_library(clang-resource-headers INTERFACE ${out_files})
448448
set_target_properties("clang-resource-headers" PROPERTIES
449-
FOLDER "Misc"
449+
FOLDER "Clang/Resources"
450450
RUNTIME_OUTPUT_DIRECTORY "${output_dir}")
451451
add_dependencies("clang-resource-headers"
452452
"core-resource-headers"

clang/lib/Tooling/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ else()
7575
add_custom_target(run-ast-api-dump-tool
7676
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ASTNodeAPI.json
7777
)
78+
set_target_properties(run-ast-api-dump-tool PROPERTIES FOLDER "Clang/Tablegenning")
7879

7980
add_custom_command(
8081
COMMENT Generate NodeIntrospection.inc
@@ -99,6 +100,7 @@ else()
99100
DEPENDS
100101
${BINARY_INCLUDE_DIR}/NodeIntrospection.inc
101102
)
103+
set_target_properties(run-ast-api-generate-tool PROPERTIES FOLDER "Clang/Tablegenning")
102104
endif()
103105

104106
add_clang_library(clangTooling

clang/test/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ configure_file(AST/gen_ast_dump_json_test.py
170170
${CLANG_BINARY_DIR}/bin/gen_ast_dump_json_test.py COPYONLY)
171171

172172
add_custom_target(clang-test-depends DEPENDS ${CLANG_TEST_DEPS})
173-
set_target_properties(clang-test-depends PROPERTIES FOLDER "Clang tests")
173+
set_target_properties(clang-test-depends PROPERTIES FOLDER "Clang/Tests")
174174

175175
add_lit_testsuite(check-clang "Running the Clang regression tests"
176176
${CMAKE_CURRENT_BINARY_DIR}
@@ -179,7 +179,6 @@ add_lit_testsuite(check-clang "Running the Clang regression tests"
179179
DEPENDS ${CLANG_TEST_DEPS}
180180
ARGS ${CLANG_TEST_EXTRA_ARGS}
181181
)
182-
set_target_properties(check-clang PROPERTIES FOLDER "Clang tests")
183182

184183
add_lit_testsuites(CLANG ${CMAKE_CURRENT_SOURCE_DIR}
185184
PARAMS ${CLANG_TEST_PARAMS}
@@ -190,7 +189,7 @@ add_lit_testsuites(CLANG ${CMAKE_CURRENT_SOURCE_DIR}
190189
# Add a legacy target spelling: clang-test
191190
add_custom_target(clang-test)
192191
add_dependencies(clang-test check-clang)
193-
set_target_properties(clang-test PROPERTIES FOLDER "Clang tests")
192+
set_target_properties(clang-test PROPERTIES FOLDER "Clang/Tests")
194193

195194
# FIXME: This logic can be removed once all buildbots have moved
196195
# debuginfo-test from clang/test to llvm/projects or monorepo.

clang/tools/libclang/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ install(DIRECTORY ../../include/clang-c
230230
# component and an install-component target, so add a dummy libclang-headers
231231
# target to allow using it in LLVM_DISTRIBUTION_COMPONENTS.
232232
add_custom_target(libclang-headers)
233-
set_target_properties(libclang-headers PROPERTIES FOLDER "Misc")
233+
set_target_properties(libclang-headers PROPERTIES FOLDER "Clang/Resources")
234234

235235
if (NOT LLVM_ENABLE_IDE)
236236
add_llvm_install_targets(install-libclang-headers

clang/unittests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
add_custom_target(ClangUnitTests)
2-
set_target_properties(ClangUnitTests PROPERTIES FOLDER "Clang tests")
2+
set_target_properties(ClangUnitTests PROPERTIES FOLDER "Clang/Tests")
33

44
if(CLANG_BUILT_STANDALONE)
55
# LLVMTesting* libraries are needed for some of the unittests.

clang/utils/ClangVisualizers/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
if (LLVM_ADD_NATIVE_VISUALIZERS_TO_SOLUTION)
44
set(CLANG_VISUALIZERS clang.natvis)
55
add_custom_target(ClangVisualizers SOURCES ${CLANG_VISUALIZERS})
6-
set_target_properties(ClangVisualizers PROPERTIES FOLDER "Utils")
6+
set_target_properties(ClangVisualizers PROPERTIES FOLDER "Clang/Misc")
77
endif()

clang/utils/TableGen/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,3 @@ add_tablegen(clang-tblgen CLANG
2727
)
2828

2929
target_link_libraries(clang-tblgen PRIVATE clangSupport_tablegen)
30-
31-
set_target_properties(clang-tblgen PROPERTIES FOLDER "Clang tablegenning")

clang/utils/hmaptool/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
install(PROGRAMS hmaptool DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" COMPONENT hmaptool)
22
add_custom_target(hmaptool ALL DEPENDS "hmaptool")
3-
set_target_properties(hmaptool PROPERTIES FOLDER "Utils")
3+
set_target_properties(hmaptool PROPERTIES FOLDER "Clang/Resources")
44

55
if(NOT LLVM_ENABLE_IDE)
66
add_llvm_install_targets("install-hmaptool"

compiler-rt/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# based on the ability of the host toolchain to target various platforms.
55

66
cmake_minimum_required(VERSION 3.20.0)
7+
set(LLVM_SUBPROJECT_TITLE "Compiler-RT")
78

89
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
910
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
@@ -88,7 +89,7 @@ if (COMPILER_RT_STANDALONE_BUILD)
8889
if (TARGET intrinsics_gen)
8990
# Loading the llvm config causes this target to be imported so place it
9091
# under the appropriate folder in an IDE.
91-
set_target_properties(intrinsics_gen PROPERTIES FOLDER "Compiler-RT Misc")
92+
set_target_properties(intrinsics_gen PROPERTIES FOLDER "LLVM/Tablegenning")
9293
endif()
9394

9495
find_package(Python3 COMPONENTS Interpreter)

0 commit comments

Comments
 (0)