diff --git a/bolt/CMakeLists.txt b/bolt/CMakeLists.txt index cc3a70fa35e0a..26df6a4208b7a 100644 --- a/bolt/CMakeLists.txt +++ b/bolt/CMakeLists.txt @@ -1,3 +1,5 @@ +set(LLVM_SUBPROJECT_TITLE "BOLT") + include(ExternalProject) set(BOLT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/bolt/cmake/modules/AddBOLT.cmake b/bolt/cmake/modules/AddBOLT.cmake index 1f69b9046320a..c7ac662c6b121 100644 --- a/bolt/cmake/modules/AddBOLT.cmake +++ b/bolt/cmake/modules/AddBOLT.cmake @@ -3,7 +3,6 @@ include(LLVMDistributionSupport) macro(add_bolt_executable name) add_llvm_executable(${name} ${ARGN}) - set_target_properties(${name} PROPERTIES FOLDER "BOLT") endmacro() macro(add_bolt_tool name) diff --git a/bolt/docs/CMakeLists.txt b/bolt/docs/CMakeLists.txt index b230512fe5717..12ae852566785 100644 --- a/bolt/docs/CMakeLists.txt +++ b/bolt/docs/CMakeLists.txt @@ -79,6 +79,7 @@ if (LLVM_ENABLE_DOXYGEN) COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating bolt doxygen documentation." VERBATIM) + set_target_properties(doxygen-bolt PROPERTIES FOLDER "BOLT/Docs") if (LLVM_BUILD_DOCS) add_dependencies(doxygen doxygen-bolt) diff --git a/bolt/test/CMakeLists.txt b/bolt/test/CMakeLists.txt index 89862fd59eb8e..d468ff984840f 100644 --- a/bolt/test/CMakeLists.txt +++ b/bolt/test/CMakeLists.txt @@ -56,7 +56,7 @@ list(APPEND BOLT_TEST_DEPS ) add_custom_target(bolt-test-depends DEPENDS ${BOLT_TEST_DEPS}) -set_target_properties(bolt-test-depends PROPERTIES FOLDER "BOLT") +set_target_properties(bolt-test-depends PROPERTIES FOLDER "BOLT/Tests") add_lit_testsuite(check-bolt "Running the BOLT regression tests" ${CMAKE_CURRENT_BINARY_DIR} @@ -64,7 +64,6 @@ add_lit_testsuite(check-bolt "Running the BOLT regression tests" DEPENDS ${BOLT_TEST_DEPS} ARGS ${BOLT_TEST_EXTRA_ARGS} ) -set_target_properties(check-bolt PROPERTIES FOLDER "BOLT") add_lit_testsuites(BOLT ${CMAKE_CURRENT_SOURCE_DIR} PARAMS ${BOLT_TEST_PARAMS} diff --git a/bolt/unittests/CMakeLists.txt b/bolt/unittests/CMakeLists.txt index 77159e92dec55..64414b83d39fe 100644 --- a/bolt/unittests/CMakeLists.txt +++ b/bolt/unittests/CMakeLists.txt @@ -1,5 +1,5 @@ add_custom_target(BoltUnitTests) -set_target_properties(BoltUnitTests PROPERTIES FOLDER "BOLT tests") +set_target_properties(BoltUnitTests PROPERTIES FOLDER "BOLT/Tests") function(add_bolt_unittest test_dirname) add_unittest(BoltUnitTests ${test_dirname} ${ARGN}) diff --git a/clang-tools-extra/CMakeLists.txt b/clang-tools-extra/CMakeLists.txt index 6a3f741721ee6..f6a6b57b5ef0b 100644 --- a/clang-tools-extra/CMakeLists.txt +++ b/clang-tools-extra/CMakeLists.txt @@ -1,3 +1,5 @@ +set(LLVM_SUBPROJECT_TITLE "Clang Tools Extra") + include(CMakeDependentOption) include(GNUInstallDirs) diff --git a/clang-tools-extra/clang-tidy/CMakeLists.txt b/clang-tools-extra/clang-tidy/CMakeLists.txt index 7e1905aa897b7..430ea4cdbb38e 100644 --- a/clang-tools-extra/clang-tidy/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/CMakeLists.txt @@ -121,7 +121,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) PATTERN "*.h" ) add_custom_target(clang-tidy-headers) - set_target_properties(clang-tidy-headers PROPERTIES FOLDER "Misc") + set_target_properties(clang-tidy-headers PROPERTIES FOLDER "Clang Tools Extra/Resources") if(NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-clang-tidy-headers DEPENDS clang-tidy-headers diff --git a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt index d9ec268650c05..4eda705c45d2a 100644 --- a/clang-tools-extra/clang-tidy/misc/CMakeLists.txt +++ b/clang-tools-extra/clang-tidy/misc/CMakeLists.txt @@ -15,6 +15,7 @@ add_custom_command( DEPENDS ${clang_tidy_confusable_chars_gen_target} ConfusableTable/confusables.txt) add_custom_target(genconfusable DEPENDS Confusables.inc) +set_target_properties(genconfusable PROPERTIES FOLDER "Clang Tools Extra/Tablegenning") add_clang_library(clangTidyMiscModule ConstCorrectnessCheck.cpp @@ -51,6 +52,7 @@ add_clang_library(clangTidyMiscModule genconfusable ClangDriverOptions ) +set_target_properties(clangTidyMiscModule PROPERTIES FOLDER "Clang Tools Extra/Libraries") clang_target_link_libraries(clangTidyMiscModule PRIVATE diff --git a/clang-tools-extra/clangd/unittests/CMakeLists.txt b/clang-tools-extra/clangd/unittests/CMakeLists.txt index 7f1ae5c43d80c..0d4628ccf25d8 100644 --- a/clang-tools-extra/clangd/unittests/CMakeLists.txt +++ b/clang-tools-extra/clangd/unittests/CMakeLists.txt @@ -29,6 +29,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/../quality/CompletionModel.cmake) gen_decision_forest(${CMAKE_CURRENT_SOURCE_DIR}/decision_forest_model DecisionForestRuntimeTest ::ns1::ns2::test::Example) add_custom_target(ClangdUnitTests) +set_target_properties(ClangdUnitTests PROPERTIES FOLDER "Clang Tools Extra/Tests") add_unittest(ClangdUnitTests ClangdTests Annotations.cpp ASTTests.cpp diff --git a/clang-tools-extra/docs/CMakeLists.txt b/clang-tools-extra/docs/CMakeLists.txt index 8f442e1f661ed..272db266b5054 100644 --- a/clang-tools-extra/docs/CMakeLists.txt +++ b/clang-tools-extra/docs/CMakeLists.txt @@ -77,6 +77,7 @@ if (DOXYGEN_FOUND) COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating clang doxygen documentation." VERBATIM) + set_target_properties(doxygen-clang-tools PROPERTIES FOLDER "Clang Tools Extra/Docs") if (LLVM_BUILD_DOCS) add_dependencies(doxygen doxygen-clang-tools) diff --git a/clang-tools-extra/include-cleaner/unittests/CMakeLists.txt b/clang-tools-extra/include-cleaner/unittests/CMakeLists.txt index 1e89534b51116..416535649f622 100644 --- a/clang-tools-extra/include-cleaner/unittests/CMakeLists.txt +++ b/clang-tools-extra/include-cleaner/unittests/CMakeLists.txt @@ -4,6 +4,7 @@ set(LLVM_LINK_COMPONENTS ) add_custom_target(ClangIncludeCleanerUnitTests) +set_target_properties(ClangIncludeCleanerUnitTests PROPERTIES FOLDER "Clang Tools Extra/Tests") add_unittest(ClangIncludeCleanerUnitTests ClangIncludeCleanerTests AnalysisTest.cpp FindHeadersTest.cpp diff --git a/clang-tools-extra/pseudo/include/CMakeLists.txt b/clang-tools-extra/pseudo/include/CMakeLists.txt index 2334cfa12e337..1d88af2eb6873 100644 --- a/clang-tools-extra/pseudo/include/CMakeLists.txt +++ b/clang-tools-extra/pseudo/include/CMakeLists.txt @@ -29,3 +29,4 @@ add_custom_command(OUTPUT ${cxx_bnf_inc} add_custom_target(cxx_gen DEPENDS ${cxx_symbols_inc} ${cxx_bnf_inc} VERBATIM) +set_target_properties(cxx_gen PROPERTIES FOLDER "Clang Tools Extra/Tablegenning") diff --git a/clang-tools-extra/pseudo/tool/CMakeLists.txt b/clang-tools-extra/pseudo/tool/CMakeLists.txt index 49e1dc29a5a4e..bead383228396 100644 --- a/clang-tools-extra/pseudo/tool/CMakeLists.txt +++ b/clang-tools-extra/pseudo/tool/CMakeLists.txt @@ -26,4 +26,5 @@ add_custom_command(OUTPUT HTMLForestResources.inc DEPENDS ${CLANG_SOURCE_DIR}/utils/bundle_resources.py HTMLForest.css HTMLForest.js HTMLForest.html VERBATIM) add_custom_target(clang-pseudo-resources DEPENDS HTMLForestResources.inc) +set_target_properties(clang-pseudo-resources PROPERTIES FOLDER "Clang Tools Extra/Resources") add_dependencies(clang-pseudo clang-pseudo-resources) diff --git a/clang-tools-extra/pseudo/unittests/CMakeLists.txt b/clang-tools-extra/pseudo/unittests/CMakeLists.txt index 821ca4d0652e1..53583ceb61864 100644 --- a/clang-tools-extra/pseudo/unittests/CMakeLists.txt +++ b/clang-tools-extra/pseudo/unittests/CMakeLists.txt @@ -3,6 +3,7 @@ set(LLVM_LINK_COMPONENTS ) add_custom_target(ClangPseudoUnitTests) +set_target_properties(ClangPseudoUnitTests PROPERTIES FOLDER "Clang Tools Extra/Tests") add_unittest(ClangPseudoUnitTests ClangPseudoTests BracketTest.cpp CXXTest.cpp diff --git a/clang-tools-extra/test/CMakeLists.txt b/clang-tools-extra/test/CMakeLists.txt index f4c529ee8af20..d488c673d1868 100644 --- a/clang-tools-extra/test/CMakeLists.txt +++ b/clang-tools-extra/test/CMakeLists.txt @@ -100,7 +100,6 @@ add_lit_testsuite(check-clang-extra "Running clang-tools-extra/test" ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${CLANG_TOOLS_TEST_DEPS} ) -set_target_properties(check-clang-extra PROPERTIES FOLDER "Clang extra tools' tests") add_lit_testsuites(CLANG-EXTRA ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${CLANG_TOOLS_TEST_DEPS} diff --git a/clang-tools-extra/unittests/CMakeLists.txt b/clang-tools-extra/unittests/CMakeLists.txt index 086a68e638307..77311540e719f 100644 --- a/clang-tools-extra/unittests/CMakeLists.txt +++ b/clang-tools-extra/unittests/CMakeLists.txt @@ -1,5 +1,5 @@ add_custom_target(ExtraToolsUnitTests) -set_target_properties(ExtraToolsUnitTests PROPERTIES FOLDER "Extra Tools Unit Tests") +set_target_properties(ExtraToolsUnitTests PROPERTIES FOLDER "Clang Tools Extra/Tests") function(add_extra_unittest test_dirname) add_unittest(ExtraToolsUnitTests ${test_dirname} ${ARGN}) diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index f092766fa19f0..09da3ad9979ff 100644 --- a/clang/CMakeLists.txt +++ b/clang/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "Clang") if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) @@ -390,7 +391,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) # Installing the headers needs to depend on generating any public # tablegen'd headers. add_custom_target(clang-headers DEPENDS clang-tablegen-targets) - set_target_properties(clang-headers PROPERTIES FOLDER "Misc") + set_target_properties(clang-headers PROPERTIES FOLDER "Clang/Resources") if(NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-clang-headers DEPENDS clang-headers @@ -398,6 +399,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) endif() add_custom_target(bash-autocomplete DEPENDS utils/bash-autocomplete.sh) + set_target_properties(bash-autocomplete PROPERTIES FOLDER "Clang/Misc") install(FILES utils/bash-autocomplete.sh DESTINATION "${CMAKE_INSTALL_DATADIR}/clang" COMPONENT bash-autocomplete) @@ -478,7 +480,7 @@ add_custom_target(clang-tablegen-targets omp_gen ClangDriverOptions ${CLANG_TABLEGEN_TARGETS}) -set_target_properties(clang-tablegen-targets PROPERTIES FOLDER "Misc") +set_target_properties(clang-tablegen-targets PROPERTIES FOLDER "Clang/Tablegenning/Targets") list(APPEND LLVM_COMMON_DEPENDS clang-tablegen-targets) # Force target to be built as soon as possible. Clang modules builds depend @@ -541,7 +543,7 @@ endif() # Custom target to install all clang libraries. add_custom_target(clang-libraries) -set_target_properties(clang-libraries PROPERTIES FOLDER "Misc") +set_target_properties(clang-libraries PROPERTIES FOLDER "Clang/Install") if(NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-clang-libraries diff --git a/clang/bindings/python/tests/CMakeLists.txt b/clang/bindings/python/tests/CMakeLists.txt index c4cd2539e9d6c..2543cf739463d 100644 --- a/clang/bindings/python/tests/CMakeLists.txt +++ b/clang/bindings/python/tests/CMakeLists.txt @@ -11,7 +11,7 @@ add_custom_target(check-clang-python WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/..) set(RUN_PYTHON_TESTS TRUE) -set_target_properties(check-clang-python PROPERTIES FOLDER "Clang tests") +set_target_properties(check-clang-python PROPERTIES FOLDER "Clang/Tests") # Tests require libclang.so which is only built with LLVM_ENABLE_PIC=ON if(NOT LLVM_ENABLE_PIC) diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake index 75b0080f67156..a5ef639187d9d 100644 --- a/clang/cmake/modules/AddClang.cmake +++ b/clang/cmake/modules/AddClang.cmake @@ -26,7 +26,6 @@ function(clang_tablegen) if(CTG_TARGET) add_public_tablegen_target(${CTG_TARGET}) - set_target_properties( ${CTG_TARGET} PROPERTIES FOLDER "Clang tablegenning") set_property(GLOBAL APPEND PROPERTY CLANG_TABLEGEN_TARGETS ${CTG_TARGET}) endif() endfunction(clang_tablegen) @@ -138,13 +137,11 @@ macro(add_clang_library name) endif() endforeach() - set_target_properties(${name} PROPERTIES FOLDER "Clang libraries") set_clang_windows_version_resource_properties(${name}) endmacro(add_clang_library) macro(add_clang_executable name) add_llvm_executable( ${name} ${ARGN} ) - set_target_properties(${name} PROPERTIES FOLDER "Clang executables") set_clang_windows_version_resource_properties(${name}) endmacro(add_clang_executable) diff --git a/clang/docs/CMakeLists.txt b/clang/docs/CMakeLists.txt index 4163dd2d90ad5..51e9db29f887f 100644 --- a/clang/docs/CMakeLists.txt +++ b/clang/docs/CMakeLists.txt @@ -78,6 +78,7 @@ if (LLVM_ENABLE_DOXYGEN) COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating clang doxygen documentation." VERBATIM) + set_target_properties(doxygen-clang PROPERTIES FOLDER "Clang/Docs") if (LLVM_BUILD_DOCS) add_dependencies(doxygen doxygen-clang) diff --git a/clang/lib/Analysis/FlowSensitive/CMakeLists.txt b/clang/lib/Analysis/FlowSensitive/CMakeLists.txt index 6631fe27f3d90..4e9262c4e6f18 100644 --- a/clang/lib/Analysis/FlowSensitive/CMakeLists.txt +++ b/clang/lib/Analysis/FlowSensitive/CMakeLists.txt @@ -36,3 +36,4 @@ add_custom_command(OUTPUT HTMLLogger.inc DEPENDS ${CLANG_SOURCE_DIR}/utils/bundle_resources.py HTMLLogger.html HTMLLogger.css HTMLLogger.js VERBATIM) add_custom_target(clangAnalysisFlowSensitiveResources DEPENDS HTMLLogger.inc) +set_target_properties(clangAnalysisFlowSensitiveResources PROPERTIES FOLDER "Clang/Misc") diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt index e6ae4e19e81db..d7cdaf39c1159 100644 --- a/clang/lib/Headers/CMakeLists.txt +++ b/clang/lib/Headers/CMakeLists.txt @@ -439,14 +439,14 @@ endforeach( f ) function(add_header_target target_name file_list) add_library(${target_name} INTERFACE ${file_list}) set_target_properties(${target_name} PROPERTIES - FOLDER "Misc" + FOLDER "Clang/Resources" RUNTIME_OUTPUT_DIRECTORY "${output_dir}") endfunction() # The catch-all clang-resource-headers target add_library(clang-resource-headers INTERFACE ${out_files}) set_target_properties("clang-resource-headers" PROPERTIES - FOLDER "Misc" + FOLDER "Clang/Resources" RUNTIME_OUTPUT_DIRECTORY "${output_dir}") add_dependencies("clang-resource-headers" "core-resource-headers" diff --git a/clang/lib/Tooling/CMakeLists.txt b/clang/lib/Tooling/CMakeLists.txt index 91e6cbdcbc44f..1fa3498a862c1 100644 --- a/clang/lib/Tooling/CMakeLists.txt +++ b/clang/lib/Tooling/CMakeLists.txt @@ -75,6 +75,7 @@ else() add_custom_target(run-ast-api-dump-tool DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ASTNodeAPI.json ) + set_target_properties(run-ast-api-dump-tool PROPERTIES FOLDER "Clang/Tablegenning") add_custom_command( COMMENT Generate NodeIntrospection.inc @@ -99,6 +100,7 @@ else() DEPENDS ${BINARY_INCLUDE_DIR}/NodeIntrospection.inc ) + set_target_properties(run-ast-api-generate-tool PROPERTIES FOLDER "Clang/Tablegenning") endif() add_clang_library(clangTooling diff --git a/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt index df34a5707da33..5fceb1d710334 100644 --- a/clang/test/CMakeLists.txt +++ b/clang/test/CMakeLists.txt @@ -170,7 +170,7 @@ configure_file(AST/gen_ast_dump_json_test.py ${CLANG_BINARY_DIR}/bin/gen_ast_dump_json_test.py COPYONLY) add_custom_target(clang-test-depends DEPENDS ${CLANG_TEST_DEPS}) -set_target_properties(clang-test-depends PROPERTIES FOLDER "Clang tests") +set_target_properties(clang-test-depends PROPERTIES FOLDER "Clang/Tests") add_lit_testsuite(check-clang "Running the Clang regression tests" ${CMAKE_CURRENT_BINARY_DIR} @@ -179,7 +179,6 @@ add_lit_testsuite(check-clang "Running the Clang regression tests" DEPENDS ${CLANG_TEST_DEPS} ARGS ${CLANG_TEST_EXTRA_ARGS} ) -set_target_properties(check-clang PROPERTIES FOLDER "Clang tests") add_lit_testsuites(CLANG ${CMAKE_CURRENT_SOURCE_DIR} PARAMS ${CLANG_TEST_PARAMS} @@ -190,7 +189,7 @@ add_lit_testsuites(CLANG ${CMAKE_CURRENT_SOURCE_DIR} # Add a legacy target spelling: clang-test add_custom_target(clang-test) add_dependencies(clang-test check-clang) -set_target_properties(clang-test PROPERTIES FOLDER "Clang tests") +set_target_properties(clang-test PROPERTIES FOLDER "Clang/Tests") # FIXME: This logic can be removed once all buildbots have moved # debuginfo-test from clang/test to llvm/projects or monorepo. diff --git a/clang/tools/libclang/CMakeLists.txt b/clang/tools/libclang/CMakeLists.txt index b5b6d2807d714..7b634003d11f4 100644 --- a/clang/tools/libclang/CMakeLists.txt +++ b/clang/tools/libclang/CMakeLists.txt @@ -230,7 +230,7 @@ install(DIRECTORY ../../include/clang-c # component and an install-component target, so add a dummy libclang-headers # target to allow using it in LLVM_DISTRIBUTION_COMPONENTS. add_custom_target(libclang-headers) -set_target_properties(libclang-headers PROPERTIES FOLDER "Misc") +set_target_properties(libclang-headers PROPERTIES FOLDER "Clang/Resources") if (NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-libclang-headers diff --git a/clang/unittests/CMakeLists.txt b/clang/unittests/CMakeLists.txt index 37ca3107b5477..b907822deb0c2 100644 --- a/clang/unittests/CMakeLists.txt +++ b/clang/unittests/CMakeLists.txt @@ -1,5 +1,5 @@ add_custom_target(ClangUnitTests) -set_target_properties(ClangUnitTests PROPERTIES FOLDER "Clang tests") +set_target_properties(ClangUnitTests PROPERTIES FOLDER "Clang/Tests") if(CLANG_BUILT_STANDALONE) # LLVMTesting* libraries are needed for some of the unittests. diff --git a/clang/utils/ClangVisualizers/CMakeLists.txt b/clang/utils/ClangVisualizers/CMakeLists.txt index 16d118a421bad..c047419050d10 100644 --- a/clang/utils/ClangVisualizers/CMakeLists.txt +++ b/clang/utils/ClangVisualizers/CMakeLists.txt @@ -3,5 +3,5 @@ if (LLVM_ADD_NATIVE_VISUALIZERS_TO_SOLUTION) set(CLANG_VISUALIZERS clang.natvis) add_custom_target(ClangVisualizers SOURCES ${CLANG_VISUALIZERS}) - set_target_properties(ClangVisualizers PROPERTIES FOLDER "Utils") + set_target_properties(ClangVisualizers PROPERTIES FOLDER "Clang/Misc") endif() diff --git a/clang/utils/TableGen/CMakeLists.txt b/clang/utils/TableGen/CMakeLists.txt index 2ca4a96cadb67..5b072a1ac1969 100644 --- a/clang/utils/TableGen/CMakeLists.txt +++ b/clang/utils/TableGen/CMakeLists.txt @@ -27,5 +27,3 @@ add_tablegen(clang-tblgen CLANG ) target_link_libraries(clang-tblgen PRIVATE clangSupport_tablegen) - -set_target_properties(clang-tblgen PROPERTIES FOLDER "Clang tablegenning") diff --git a/clang/utils/hmaptool/CMakeLists.txt b/clang/utils/hmaptool/CMakeLists.txt index 511268069bd1c..bb40ca3ea90a9 100644 --- a/clang/utils/hmaptool/CMakeLists.txt +++ b/clang/utils/hmaptool/CMakeLists.txt @@ -1,6 +1,6 @@ install(PROGRAMS hmaptool DESTINATION "${CLANG_TOOLS_INSTALL_DIR}" COMPONENT hmaptool) add_custom_target(hmaptool ALL DEPENDS "hmaptool") -set_target_properties(hmaptool PROPERTIES FOLDER "Utils") +set_target_properties(hmaptool PROPERTIES FOLDER "Clang/Resources") if(NOT LLVM_ENABLE_IDE) add_llvm_install_targets("install-hmaptool" diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index 8649507ce1c79..5a428ed39eacb 100644 --- a/compiler-rt/CMakeLists.txt +++ b/compiler-rt/CMakeLists.txt @@ -4,6 +4,7 @@ # based on the ability of the host toolchain to target various platforms. cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "Compiler-RT") if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) @@ -88,7 +89,7 @@ if (COMPILER_RT_STANDALONE_BUILD) if (TARGET intrinsics_gen) # Loading the llvm config causes this target to be imported so place it # under the appropriate folder in an IDE. - set_target_properties(intrinsics_gen PROPERTIES FOLDER "Compiler-RT Misc") + set_target_properties(intrinsics_gen PROPERTIES FOLDER "LLVM/Tablegenning") endif() find_package(Python3 COMPONENTS Interpreter) diff --git a/compiler-rt/cmake/Modules/AddCompilerRT.cmake b/compiler-rt/cmake/Modules/AddCompilerRT.cmake index 6e0d9dbff65a9..61c727b36bff3 100644 --- a/compiler-rt/cmake/Modules/AddCompilerRT.cmake +++ b/compiler-rt/cmake/Modules/AddCompilerRT.cmake @@ -89,7 +89,7 @@ function(add_compiler_rt_object_libraries name) "${libname}" MATCHES ".*\.osx.*") foreach(arch ${LIB_ARCHS_${libname}}) list(APPEND target_flags - "SHELL:-target ${arch}-apple-macos${DARWIN_osx_MIN_VER} -darwin-target-variant ${arch}-apple-ios13.1-macabi") + "SHELL:-target ${arch}-apple-macos${DARWIN_osx_MIN_V357ER} -darwin-target-variant ${arch}-apple-ios13.1-macabi") endforeach() endif() @@ -97,7 +97,7 @@ function(add_compiler_rt_object_libraries name) ${extra_cflags_${libname}} ${target_flags}) set_property(TARGET ${libname} APPEND PROPERTY COMPILE_DEFINITIONS ${LIB_DEFS}) - set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Libraries") + set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT/Libraries") if(APPLE) set_target_properties(${libname} PROPERTIES OSX_ARCHITECTURES "${LIB_ARCHS_${libname}}") @@ -116,7 +116,7 @@ endmacro() function(add_compiler_rt_component name) add_custom_target(${name}) - set_target_properties(${name} PROPERTIES FOLDER "Compiler-RT Misc") + set_target_properties(${name} PROPERTIES FOLDER "Compiler-RT/Misc") if(COMMAND runtime_register_component) runtime_register_component(${name}) endif() @@ -299,7 +299,7 @@ function(add_compiler_rt_runtime name type) if(NOT TARGET ${LIB_PARENT_TARGET}) add_custom_target(${LIB_PARENT_TARGET}) set_target_properties(${LIB_PARENT_TARGET} PROPERTIES - FOLDER "Compiler-RT Misc") + FOLDER "Compiler-RT/Misc") endif() endif() @@ -354,6 +354,7 @@ function(add_compiler_rt_runtime name type) DEPENDS ${sources_${libname}} COMMENT "Building C object ${output_file_${libname}}") add_custom_target(${libname} DEPENDS ${output_dir_${libname}}/${output_file_${libname}}) + set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT/Runtimes") install(FILES ${output_dir_${libname}}/${output_file_${libname}} DESTINATION ${install_dir_${libname}} ${COMPONENT_OPTION}) @@ -376,8 +377,8 @@ function(add_compiler_rt_runtime name type) add_dependencies(${libname} ${LIB_DEPS}) endif() set_target_properties(${libname} PROPERTIES - OUTPUT_NAME ${output_name_${libname}}) - set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Runtime") + OUTPUT_NAME ${output_name_${libname}} + FOLDER "Compiler-RT/Runtimes") if(LIB_LINK_LIBS) target_link_libraries(${libname} PRIVATE ${LIB_LINK_LIBS}) endif() @@ -544,7 +545,7 @@ function(add_compiler_rt_test test_suite test_name arch) DEPENDS ${TEST_DEPS} ) add_custom_target(T${test_name} DEPENDS "${output_bin}") - set_target_properties(T${test_name} PROPERTIES FOLDER "Compiler-RT Tests") + set_target_properties(T${test_name} PROPERTIES FOLDER "Compiler-RT/Tests") # Make the test suite depend on the binary. add_dependencies(${test_suite} T${test_name}) @@ -564,7 +565,7 @@ macro(add_compiler_rt_resource_file target_name file_name component) COMPONENT ${component}) add_dependencies(${component} ${target_name}) - set_target_properties(${target_name} PROPERTIES FOLDER "Compiler-RT Misc") + set_target_properties(${target_name} PROPERTIES FOLDER "Compiler-RT/Resources") endmacro() macro(add_compiler_rt_script name) @@ -613,7 +614,7 @@ macro(add_custom_libcxx name prefix) COMMENT "Clobbering ${name} build directories" USES_TERMINAL ) - set_target_properties(${name}-clear PROPERTIES FOLDER "Compiler-RT Misc") + set_target_properties(${name}-clear PROPERTIES FOLDER "Compiler-RT/Misc") add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${name}-clobber-stamp @@ -625,7 +626,7 @@ macro(add_custom_libcxx name prefix) add_custom_target(${name}-clobber DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${name}-clobber-stamp) - set_target_properties(${name}-clobber PROPERTIES FOLDER "Compiler-RT Misc") + set_target_properties(${name}-clobber PROPERTIES FOLDER "Compiler-RT/Misc") set(PASSTHROUGH_VARIABLES ANDROID diff --git a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake index 1882893ad42c0..6b4289baaf847 100644 --- a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake +++ b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake @@ -336,7 +336,7 @@ macro(darwin_add_builtin_library name suffix) list(APPEND ${LIB_OS}_${suffix}_libs ${libname}) list(APPEND ${LIB_OS}_${suffix}_lipo_flags -arch ${arch} $) - set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT Libraries") + set_target_properties(${libname} PROPERTIES FOLDER "Compiler-RT/Libraries") endmacro() function(darwin_lipo_libs name) @@ -355,7 +355,7 @@ function(darwin_lipo_libs name) ) add_custom_target(${name} DEPENDS ${LIB_OUTPUT_DIR}/lib${name}.a) - set_target_properties(${name} PROPERTIES FOLDER "Compiler-RT Misc") + set_target_properties(${name} PROPERTIES FOLDER "Compiler-RT/Misc") add_dependencies(${LIB_PARENT_TARGET} ${name}) if(CMAKE_CONFIGURATION_TYPES) diff --git a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake index a6c6ef93500d5..a6a8023a24f82 100644 --- a/compiler-rt/cmake/Modules/CompilerRTUtils.cmake +++ b/compiler-rt/cmake/Modules/CompilerRTUtils.cmake @@ -542,9 +542,9 @@ function(add_compiler_rt_install_targets name) -DCMAKE_INSTALL_DO_STRIP=1 -P "${CMAKE_BINARY_DIR}/cmake_install.cmake") set_target_properties(install-${ARG_PARENT_TARGET} PROPERTIES - FOLDER "Compiler-RT Misc") + FOLDER "Compiler-RT/Install") set_target_properties(install-${ARG_PARENT_TARGET}-stripped PROPERTIES - FOLDER "Compiler-RT Misc") + FOLDER "Compiler-RT/Install") add_dependencies(install-compiler-rt install-${ARG_PARENT_TARGET}) add_dependencies(install-compiler-rt-stripped install-${ARG_PARENT_TARGET}-stripped) endif() diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake index 1e3317de80ac3..93acec5c58331 100644 --- a/compiler-rt/cmake/base-config-ix.cmake +++ b/compiler-rt/cmake/base-config-ix.cmake @@ -23,13 +23,13 @@ endif() add_custom_target(compiler-rt ALL) add_custom_target(install-compiler-rt) add_custom_target(install-compiler-rt-stripped) +set_property(TARGET compiler-rt PROPERTY FOLDER "Compiler-RT") set_property( TARGET - compiler-rt install-compiler-rt install-compiler-rt-stripped PROPERTY - FOLDER "Compiler-RT Misc" + FOLDER "Compiler-RT/Install" ) # Setting these variables from an LLVM build is sufficient that compiler-rt can diff --git a/compiler-rt/include/CMakeLists.txt b/compiler-rt/include/CMakeLists.txt index f10188a5f77b8..d598a94ee2e23 100644 --- a/compiler-rt/include/CMakeLists.txt +++ b/compiler-rt/include/CMakeLists.txt @@ -79,7 +79,7 @@ endforeach( f ) add_custom_target(compiler-rt-headers ALL DEPENDS ${out_files}) add_dependencies(compiler-rt compiler-rt-headers) -set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT Misc") +set_target_properties(compiler-rt-headers PROPERTIES FOLDER "Compiler-RT/Resources") # Install sanitizer headers. install(FILES ${SANITIZER_HEADERS} diff --git a/compiler-rt/lib/asan/tests/CMakeLists.txt b/compiler-rt/lib/asan/tests/CMakeLists.txt index bda47bd7fd6a2..7abd4c89ac6bc 100644 --- a/compiler-rt/lib/asan/tests/CMakeLists.txt +++ b/compiler-rt/lib/asan/tests/CMakeLists.txt @@ -118,15 +118,15 @@ append_list_if(COMPILER_RT_HAS_LIBLOG log ASAN_UNITTEST_NOINST_LIBS) # Main AddressSanitizer unit tests. add_custom_target(AsanUnitTests) -set_target_properties(AsanUnitTests PROPERTIES FOLDER "Compiler-RT Tests") +set_target_properties(AsanUnitTests PROPERTIES FOLDER "Compiler-RT/Tests") # AddressSanitizer unit tests with dynamic runtime (on platforms where it's # not the default). add_custom_target(AsanDynamicUnitTests) -set_target_properties(AsanDynamicUnitTests PROPERTIES FOLDER "Compiler-RT Tests") +set_target_properties(AsanDynamicUnitTests PROPERTIES FOLDER "Compiler-RT/Tests") # ASan benchmarks (not actively used now). add_custom_target(AsanBenchmarks) -set_target_properties(AsanBenchmarks PROPERTIES FOLDER "Compiler-RT Tests") +set_target_properties(AsanBenchmarks PROPERTIES FOLDER "Compiler-RT/Tests") set(ASAN_NOINST_TEST_SOURCES ${COMPILER_RT_GTEST_SOURCE} @@ -278,7 +278,7 @@ if(COMPILER_RT_CAN_EXECUTE_TESTS AND NOT ANDROID) add_library(${ASAN_TEST_RUNTIME} STATIC ${ASAN_TEST_RUNTIME_OBJECTS}) set_target_properties(${ASAN_TEST_RUNTIME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - FOLDER "Compiler-RT Runtime tests") + FOLDER "Compiler-RT/Tests/Runtime") add_asan_tests(${arch} ${ASAN_TEST_RUNTIME} KIND "-inline") add_asan_tests(${arch} ${ASAN_TEST_RUNTIME} KIND "-calls" diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt index f9611574a562b..6a7bf6d93accc 100644 --- a/compiler-rt/lib/builtins/CMakeLists.txt +++ b/compiler-rt/lib/builtins/CMakeLists.txt @@ -750,7 +750,7 @@ set(ve_SOURCES ${GENERIC_SOURCES}) add_custom_target(builtins) -set_target_properties(builtins PROPERTIES FOLDER "Compiler-RT Misc") +set_target_properties(builtins PROPERTIES FOLDER "Compiler-RT/Misc") option(COMPILER_RT_ENABLE_SOFTWARE_INT128 "Enable the int128 builtin routines for all targets." diff --git a/compiler-rt/lib/fuzzer/tests/CMakeLists.txt b/compiler-rt/lib/fuzzer/tests/CMakeLists.txt index 8f5707c687ac5..5086c0334b22b 100644 --- a/compiler-rt/lib/fuzzer/tests/CMakeLists.txt +++ b/compiler-rt/lib/fuzzer/tests/CMakeLists.txt @@ -12,10 +12,10 @@ if (APPLE) endif() add_custom_target(FuzzerUnitTests) -set_target_properties(FuzzerUnitTests PROPERTIES FOLDER "Compiler-RT Tests") +set_target_properties(FuzzerUnitTests PROPERTIES FOLDER "Compiler-RT/Tests") add_custom_target(FuzzedDataProviderUnitTests) -set_target_properties(FuzzedDataProviderUnitTests PROPERTIES FOLDER "Compiler-RT Tests") +set_target_properties(FuzzedDataProviderUnitTests PROPERTIES FOLDER "Compiler-RT/Tests") set(LIBFUZZER_UNITTEST_LINK_FLAGS ${COMPILER_RT_UNITTEST_LINK_FLAGS}) list(APPEND LIBFUZZER_UNITTEST_LINK_FLAGS --driver-mode=g++) @@ -58,7 +58,7 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH IN_LIST FUZZER_SUPPORTED_ARCH) ${LIBFUZZER_TEST_RUNTIME_OBJECTS}) set_target_properties(${LIBFUZZER_TEST_RUNTIME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - FOLDER "Compiler-RT Runtime tests") + FOLDER "Compiler-RT/Tests/Runtime") if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND COMPILER_RT_LIBCXX_PATH AND diff --git a/compiler-rt/lib/gwp_asan/tests/CMakeLists.txt b/compiler-rt/lib/gwp_asan/tests/CMakeLists.txt index 2ec332ea74c13..ca43ec2a94ac4 100644 --- a/compiler-rt/lib/gwp_asan/tests/CMakeLists.txt +++ b/compiler-rt/lib/gwp_asan/tests/CMakeLists.txt @@ -35,7 +35,7 @@ set(GWP_ASAN_UNIT_TEST_HEADERS harness.h) add_custom_target(GwpAsanUnitTests) -set_target_properties(GwpAsanUnitTests PROPERTIES FOLDER "Compiler-RT Tests") +set_target_properties(GwpAsanUnitTests PROPERTIES FOLDER "Compiler-RT/Tests") set(GWP_ASAN_UNITTEST_LINK_FLAGS ${COMPILER_RT_UNITTEST_LINK_FLAGS} -ldl @@ -67,7 +67,7 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH IN_LIST GWP_ASAN_SUPPORTED_ARCH) set_target_properties(${GWP_ASAN_TEST_RUNTIME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - FOLDER "Compiler-RT Runtime tests") + FOLDER "Compiler-RT/Tests/Runtime") set(GwpAsanTestObjects) generate_compiler_rt_tests(GwpAsanTestObjects diff --git a/compiler-rt/lib/interception/tests/CMakeLists.txt b/compiler-rt/lib/interception/tests/CMakeLists.txt index 0a235c662af3b..f348c35cbe22f 100644 --- a/compiler-rt/lib/interception/tests/CMakeLists.txt +++ b/compiler-rt/lib/interception/tests/CMakeLists.txt @@ -81,7 +81,7 @@ macro(add_interceptor_lib library) add_library(${library} STATIC ${ARGN}) set_target_properties(${library} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - FOLDER "Compiler-RT Runtime tests") + FOLDER "Compiler-RT/Tests/Runtime") endmacro() function(get_interception_lib_for_arch arch lib) @@ -96,7 +96,7 @@ endfunction() # Interception unit tests testsuite. add_custom_target(InterceptionUnitTests) set_target_properties(InterceptionUnitTests PROPERTIES - FOLDER "Compiler-RT Tests") + FOLDER "Compiler-RT/Tests") # Adds interception tests for architecture. macro(add_interception_tests_for_arch arch) diff --git a/compiler-rt/lib/memprof/tests/CMakeLists.txt b/compiler-rt/lib/memprof/tests/CMakeLists.txt index dc19ac5cd49a9..0b5c302a4ce5d 100644 --- a/compiler-rt/lib/memprof/tests/CMakeLists.txt +++ b/compiler-rt/lib/memprof/tests/CMakeLists.txt @@ -64,7 +64,7 @@ macro(add_memprof_tests_for_arch arch) add_library(${MEMPROF_TEST_RUNTIME} STATIC ${MEMPROF_TEST_RUNTIME_OBJECTS}) set_target_properties(${MEMPROF_TEST_RUNTIME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - FOLDER "Compiler-RT Runtime tests") + FOLDER "Compiler-RT/Tests/Runtime") set(MEMPROF_TEST_OBJECTS) generate_compiler_rt_tests(MEMPROF_TEST_OBJECTS MemProfUnitTests "MemProf-${arch}-UnitTest" ${arch} @@ -78,7 +78,7 @@ endmacro() # MemProf unit tests testsuite. add_custom_target(MemProfUnitTests) -set_target_properties(MemProfUnitTests PROPERTIES FOLDER "Compiler-RT Tests") +set_target_properties(MemProfUnitTests PROPERTIES FOLDER "Compiler-RT/Tests") if(COMPILER_RT_CAN_EXECUTE_TESTS AND COMPILER_RT_DEFAULT_TARGET_ARCH IN_LIST MEMPROF_SUPPORTED_ARCH) # MemProf unit tests are only run on the host machine. foreach(arch ${COMPILER_RT_DEFAULT_TARGET_ARCH}) diff --git a/compiler-rt/lib/orc/tests/CMakeLists.txt b/compiler-rt/lib/orc/tests/CMakeLists.txt index e8f4c95b8a657..7039a32e6bc8b 100644 --- a/compiler-rt/lib/orc/tests/CMakeLists.txt +++ b/compiler-rt/lib/orc/tests/CMakeLists.txt @@ -4,11 +4,11 @@ include_directories(..) # Unit tests target. add_custom_target(OrcRTUnitTests) -set_target_properties(OrcRTUnitTests PROPERTIES FOLDER "OrcRT unittests") +set_target_properties(OrcRTUnitTests PROPERTIES FOLDER "Compiler-RT/Tests") # Testing tools target. add_custom_target(OrcRTTools) -set_target_properties(OrcRTTools PROPERTIES FOLDER "OrcRT tools") +set_target_properties(OrcRTTools PROPERTIES FOLDER "Compiler-RT/Tools") set(ORC_UNITTEST_CFLAGS # FIXME: This should be set for all unit tests. @@ -22,7 +22,7 @@ function(add_orc_lib library) add_library(${library} STATIC ${ARGN}) set_target_properties(${library} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - FOLDER "Compiler-RT Runtime tests") + FOLDER "Compiler-RT/Tests/Runtime") endfunction() function(get_orc_lib_for_arch arch lib) diff --git a/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt b/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt index a3efe68715082..2b4c15125263a 100644 --- a/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt +++ b/compiler-rt/lib/sanitizer_common/tests/CMakeLists.txt @@ -143,7 +143,7 @@ macro(add_sanitizer_common_lib library) add_library(${library} STATIC ${ARGN}) set_target_properties(${library} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - FOLDER "Compiler-RT Runtime tests") + FOLDER "Compiler-RT/Tests/Runtime") endmacro() function(get_sanitizer_common_lib_for_arch arch lib) @@ -157,7 +157,7 @@ endfunction() # Sanitizer_common unit tests testsuite. add_custom_target(SanitizerUnitTests) -set_target_properties(SanitizerUnitTests PROPERTIES FOLDER "Compiler-RT Tests") +set_target_properties(SanitizerUnitTests PROPERTIES FOLDER "Compiler-RT/Tests") # Adds sanitizer tests for architecture. macro(add_sanitizer_tests_for_arch arch) diff --git a/compiler-rt/lib/stats/CMakeLists.txt b/compiler-rt/lib/stats/CMakeLists.txt index 60c02556f80d6..41026c4bac38d 100644 --- a/compiler-rt/lib/stats/CMakeLists.txt +++ b/compiler-rt/lib/stats/CMakeLists.txt @@ -4,7 +4,7 @@ set(STATS_HEADERS include_directories(..) add_custom_target(stats) -set_target_properties(stats PROPERTIES FOLDER "Compiler-RT Misc") +set_target_properties(stats PROPERTIES FOLDER "Compiler-RT/Misc") if(APPLE) set(STATS_LIB_FLAVOR SHARED) diff --git a/compiler-rt/lib/tsan/CMakeLists.txt b/compiler-rt/lib/tsan/CMakeLists.txt index c5ec6b0ddfd22..1ff3292446dcd 100644 --- a/compiler-rt/lib/tsan/CMakeLists.txt +++ b/compiler-rt/lib/tsan/CMakeLists.txt @@ -35,7 +35,7 @@ if(COMPILER_RT_LIBCXX_PATH AND endforeach() add_custom_target(libcxx_tsan DEPENDS ${libcxx_tsan_deps}) - set_target_properties(libcxx_tsan PROPERTIES FOLDER "Compiler-RT Misc") + set_target_properties(libcxx_tsan PROPERTIES FOLDER "Compiler-RT/Misc") endif() if(COMPILER_RT_INCLUDE_TESTS) diff --git a/compiler-rt/lib/tsan/dd/CMakeLists.txt b/compiler-rt/lib/tsan/dd/CMakeLists.txt index a7359c573f142..b5bf5a88651a0 100644 --- a/compiler-rt/lib/tsan/dd/CMakeLists.txt +++ b/compiler-rt/lib/tsan/dd/CMakeLists.txt @@ -20,7 +20,7 @@ append_list_if(COMPILER_RT_HAS_LIBRT rt DD_LINKLIBS) append_list_if(COMPILER_RT_HAS_LIBPTHREAD pthread DD_LINKLIBS) add_custom_target(dd) -set_target_properties(dd PROPERTIES FOLDER "Compiler-RT Misc") +set_target_properties(dd PROPERTIES FOLDER "Compiler-RT/Misc") # Deadlock detector is currently supported on 64-bit Linux only. if(CAN_TARGET_x86_64 AND UNIX AND NOT APPLE AND NOT ANDROID) diff --git a/compiler-rt/lib/tsan/rtl/CMakeLists.txt b/compiler-rt/lib/tsan/rtl/CMakeLists.txt index 791c0596f65ab..f40e72dbde1f9 100644 --- a/compiler-rt/lib/tsan/rtl/CMakeLists.txt +++ b/compiler-rt/lib/tsan/rtl/CMakeLists.txt @@ -167,7 +167,7 @@ if(APPLE) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../go COMMENT "Checking TSan Go runtime..." VERBATIM) - set_target_properties(GotsanRuntimeCheck PROPERTIES FOLDER "Compiler-RT Misc") + set_target_properties(GotsanRuntimeCheck PROPERTIES FOLDER "Compiler-RT/Misc") else() foreach(arch ${TSAN_SUPPORTED_ARCH}) if(arch STREQUAL "x86_64") diff --git a/compiler-rt/lib/xray/tests/CMakeLists.txt b/compiler-rt/lib/xray/tests/CMakeLists.txt index 0a428b9a30b18..a6e0e9a6f00c8 100644 --- a/compiler-rt/lib/xray/tests/CMakeLists.txt +++ b/compiler-rt/lib/xray/tests/CMakeLists.txt @@ -1,7 +1,7 @@ include_directories(..) add_custom_target(XRayUnitTests) -set_target_properties(XRayUnitTests PROPERTIES FOLDER "XRay unittests") +set_target_properties(XRayUnitTests PROPERTIES FOLDER "Compiler-RT/Tests") # Sanity check XRAY_ALL_SOURCE_FILES_ABS_PATHS list(LENGTH XRAY_ALL_SOURCE_FILES_ABS_PATHS XASFAP_LENGTH) @@ -34,7 +34,7 @@ function(add_xray_lib library) add_library(${library} STATIC ${ARGN}) set_target_properties(${library} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - FOLDER "Compiler-RT Runtime tests") + FOLDER "Compiler-RT/Tests/Runtime") endfunction() function(get_xray_lib_for_arch arch lib) diff --git a/compiler-rt/test/CMakeLists.txt b/compiler-rt/test/CMakeLists.txt index edc007aaf477a..db415b2d3ad19 100644 --- a/compiler-rt/test/CMakeLists.txt +++ b/compiler-rt/test/CMakeLists.txt @@ -110,6 +110,7 @@ endif() # introduce a rule to run to run all of them. get_property(LLVM_COMPILER_RT_LIT_DEPENDS GLOBAL PROPERTY LLVM_COMPILER_RT_LIT_DEPENDS) add_custom_target(compiler-rt-test-depends) +set_target_properties(compiler-rt-test-depends PROPERTIES FOLDER "Compiler-RT/Tests") if(LLVM_COMPILER_RT_LIT_DEPENDS) add_dependencies(compiler-rt-test-depends ${LLVM_COMPILER_RT_LIT_DEPENDS}) endif() diff --git a/compiler-rt/test/asan/CMakeLists.txt b/compiler-rt/test/asan/CMakeLists.txt index d8c779c4ad6c5..2d683e61d6954 100644 --- a/compiler-rt/test/asan/CMakeLists.txt +++ b/compiler-rt/test/asan/CMakeLists.txt @@ -174,7 +174,6 @@ add_lit_testsuite(check-asan "Running the AddressSanitizer tests" ${ASAN_TESTSUITES} ${exclude_from_check_all} DEPENDS ${ASAN_TEST_DEPS}) -set_target_properties(check-asan PROPERTIES FOLDER "Compiler-RT Misc") if(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME) add_lit_testsuite(check-asan-dynamic @@ -182,6 +181,4 @@ if(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME) ${ASAN_DYNAMIC_TESTSUITES} ${exclude_from_check_all.g} DEPENDS ${ASAN_DYNAMIC_TEST_DEPS}) - set_target_properties(check-asan-dynamic - PROPERTIES FOLDER "Compiler-RT Misc") endif() diff --git a/compiler-rt/test/asan_abi/CMakeLists.txt b/compiler-rt/test/asan_abi/CMakeLists.txt index 1114ed1b82793..51c7980459113 100644 --- a/compiler-rt/test/asan_abi/CMakeLists.txt +++ b/compiler-rt/test/asan_abi/CMakeLists.txt @@ -78,4 +78,3 @@ add_lit_testsuite(check-asan-abi "Running the AddressSanitizerABI tests" ${ASAN_ABI_TESTSUITES} ${exclude_from_check_all} DEPENDS ${ASAN_ABI_TEST_DEPS}) -set_target_properties(check-asan-abi PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/builtins/CMakeLists.txt b/compiler-rt/test/builtins/CMakeLists.txt index 7c0469a41efd9..8fdcec6029a2a 100644 --- a/compiler-rt/test/builtins/CMakeLists.txt +++ b/compiler-rt/test/builtins/CMakeLists.txt @@ -113,4 +113,3 @@ endforeach() add_lit_testsuite(check-builtins "Running the Builtins tests" ${BUILTINS_TESTSUITES} DEPENDS ${BUILTINS_TEST_DEPS}) -set_target_properties(check-builtins PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/cfi/CMakeLists.txt b/compiler-rt/test/cfi/CMakeLists.txt index e095e5f23efc4..88def444d7dda 100644 --- a/compiler-rt/test/cfi/CMakeLists.txt +++ b/compiler-rt/test/cfi/CMakeLists.txt @@ -95,6 +95,3 @@ add_lit_target(check-cfi-and-supported "Running the cfi regression tests" ${CFI_TESTSUITES} PARAMS check_supported=1 DEPENDS ${CFI_TEST_DEPS}) - -set_target_properties(check-cfi PROPERTIES FOLDER "Compiler-RT Misc") -set_target_properties(check-cfi-and-supported PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/dfsan/CMakeLists.txt b/compiler-rt/test/dfsan/CMakeLists.txt index 14e431a0375b9..98fe5665c3ce5 100644 --- a/compiler-rt/test/dfsan/CMakeLists.txt +++ b/compiler-rt/test/dfsan/CMakeLists.txt @@ -26,4 +26,3 @@ list(APPEND DFSAN_TEST_DEPS dfsan) add_lit_testsuite(check-dfsan "Running the DataFlowSanitizer tests" ${DFSAN_TESTSUITES} DEPENDS ${DFSAN_TEST_DEPS}) -set_target_properties(check-dfsan PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/fuzzer/CMakeLists.txt b/compiler-rt/test/fuzzer/CMakeLists.txt index 5bcb44757bae4..8d29a4bea5f34 100644 --- a/compiler-rt/test/fuzzer/CMakeLists.txt +++ b/compiler-rt/test/fuzzer/CMakeLists.txt @@ -89,7 +89,6 @@ if(LIBFUZZER_TESTSUITES) add_lit_testsuite(check-fuzzer "Running libFuzzer tests" ${LIBFUZZER_TESTSUITES} DEPENDS ${LIBFUZZER_TEST_DEPS}) - set_target_properties(check-fuzzer PROPERTIES FOLDER "Compiler-RT Tests") endif() if (APPLE) diff --git a/compiler-rt/test/gwp_asan/CMakeLists.txt b/compiler-rt/test/gwp_asan/CMakeLists.txt index 86260027426fe..29e34cb5f6200 100644 --- a/compiler-rt/test/gwp_asan/CMakeLists.txt +++ b/compiler-rt/test/gwp_asan/CMakeLists.txt @@ -40,4 +40,3 @@ endif() add_lit_testsuite(check-gwp_asan "Running the GWP-ASan tests" ${GWP_ASAN_TESTSUITES} DEPENDS ${GWP_ASAN_TEST_DEPS}) -set_target_properties(check-gwp_asan PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/hwasan/CMakeLists.txt b/compiler-rt/test/hwasan/CMakeLists.txt index 927d0d74bd6ec..d086db1e386fc 100644 --- a/compiler-rt/test/hwasan/CMakeLists.txt +++ b/compiler-rt/test/hwasan/CMakeLists.txt @@ -33,7 +33,6 @@ add_lit_testsuite(check-hwasan "Running the HWAddressSanitizer tests" DEPENDS ${HWASAN_TEST_DEPS} PARAMS "HWASAN_ENABLE_ALIASES=1" ) -set_target_properties(check-hwasan PROPERTIES FOLDER "Compiler-RT Misc") add_lit_testsuite(check-hwasan-lam "Running the HWAddressSanitizer tests with Intel LAM" @@ -42,4 +41,3 @@ add_lit_testsuite(check-hwasan-lam PARAMS "HWASAN_ENABLE_ALIASES=0" EXCLUDE_FROM_CHECK_ALL ) -set_target_properties(check-hwasan-lam PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/interception/CMakeLists.txt b/compiler-rt/test/interception/CMakeLists.txt index b8e2faa59fad7..df69453c4fb4e 100644 --- a/compiler-rt/test/interception/CMakeLists.txt +++ b/compiler-rt/test/interception/CMakeLists.txt @@ -14,4 +14,3 @@ endif() add_lit_testsuite(check-interception "Running the Interception tests" ${INTERCEPTION_TESTSUITES} DEPENDS ${INTERCEPTION_TEST_DEPS}) -set_target_properties(check-interception PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/lsan/CMakeLists.txt b/compiler-rt/test/lsan/CMakeLists.txt index e487f1a862c81..1c545a97d3acc 100644 --- a/compiler-rt/test/lsan/CMakeLists.txt +++ b/compiler-rt/test/lsan/CMakeLists.txt @@ -48,4 +48,3 @@ append_list_if(COMPILER_RT_HAS_HWASAN hwasan LSAN_TEST_DEPS) add_lit_testsuite(check-lsan "Running the LeakSanitizer tests" ${LSAN_TESTSUITES} DEPENDS ${LSAN_TEST_DEPS}) -set_target_properties(check-lsan PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/memprof/CMakeLists.txt b/compiler-rt/test/memprof/CMakeLists.txt index 3f0ba3812485d..65a78b489eb3c 100644 --- a/compiler-rt/test/memprof/CMakeLists.txt +++ b/compiler-rt/test/memprof/CMakeLists.txt @@ -46,12 +46,9 @@ endforeach() add_lit_testsuite(check-memprof "Running the MemProfiler tests" ${MEMPROF_TESTSUITES} DEPENDS ${MEMPROF_TEST_DEPS}) -set_target_properties(check-memprof PROPERTIES FOLDER "Compiler-RT Misc") add_lit_testsuite(check-memprof-dynamic "Running the MemProfiler tests with dynamic runtime" ${MEMPROF_DYNAMIC_TESTSUITES} ${exclude_from_check_all.g} DEPENDS ${MEMPROF_DYNAMIC_TEST_DEPS}) -set_target_properties(check-memprof-dynamic - PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/metadata/CMakeLists.txt b/compiler-rt/test/metadata/CMakeLists.txt index 4245937f3ce56..0a1c6a4ae9eef 100644 --- a/compiler-rt/test/metadata/CMakeLists.txt +++ b/compiler-rt/test/metadata/CMakeLists.txt @@ -16,5 +16,4 @@ if(CAN_TARGET_x86_64) add_lit_testsuite(check-sanmd "Running the SanitizerBinaryMetadata tests" ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${METADATA_TEST_DEPS}) - set_target_properties(check-sanmd PROPERTIES FOLDER "Compiler-RT Misc") endif() diff --git a/compiler-rt/test/msan/CMakeLists.txt b/compiler-rt/test/msan/CMakeLists.txt index 9f784507c4ee1..ff19c11971b2d 100644 --- a/compiler-rt/test/msan/CMakeLists.txt +++ b/compiler-rt/test/msan/CMakeLists.txt @@ -55,4 +55,3 @@ add_lit_testsuite(check-msan "Running the MemorySanitizer tests" ${MSAN_TESTSUITES} DEPENDS ${MSAN_TEST_DEPS} ) -set_target_properties(check-msan PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/orc/CMakeLists.txt b/compiler-rt/test/orc/CMakeLists.txt index 746b1e93b8d5d..944753bf5c33c 100644 --- a/compiler-rt/test/orc/CMakeLists.txt +++ b/compiler-rt/test/orc/CMakeLists.txt @@ -32,4 +32,3 @@ endif() add_lit_testsuite(check-orc-rt "Running the ORC runtime tests" ${ORC_TESTSUITES} DEPENDS ${ORC_TEST_DEPS}) -set_target_properties(check-orc-rt PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/profile/CMakeLists.txt b/compiler-rt/test/profile/CMakeLists.txt index 3170d65aaf918..a6d8a9684508d 100644 --- a/compiler-rt/test/profile/CMakeLists.txt +++ b/compiler-rt/test/profile/CMakeLists.txt @@ -33,4 +33,3 @@ endforeach() add_lit_testsuite(check-profile "Running the profile tests" ${PROFILE_TESTSUITES} DEPENDS ${PROFILE_TEST_DEPS}) -set_target_properties(check-profile PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/safestack/CMakeLists.txt b/compiler-rt/test/safestack/CMakeLists.txt index 2746102bd89b3..89ba6e74884b1 100644 --- a/compiler-rt/test/safestack/CMakeLists.txt +++ b/compiler-rt/test/safestack/CMakeLists.txt @@ -27,4 +27,3 @@ configure_lit_site_cfg( add_lit_testsuite(check-safestack "Running the SafeStack tests" ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${SAFESTACK_TEST_DEPS}) -set_target_properties(check-safestack PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/sanitizer_common/CMakeLists.txt b/compiler-rt/test/sanitizer_common/CMakeLists.txt index f2df8cec3549b..edecc04d48c75 100644 --- a/compiler-rt/test/sanitizer_common/CMakeLists.txt +++ b/compiler-rt/test/sanitizer_common/CMakeLists.txt @@ -114,6 +114,4 @@ if(SANITIZER_COMMON_TESTSUITES) add_lit_testsuite(check-sanitizer "Running sanitizer_common tests" ${SANITIZER_COMMON_TESTSUITES} DEPENDS ${SANITIZER_COMMON_TEST_DEPS}) - set_target_properties(check-sanitizer PROPERTIES FOLDER - "Compiler-RT Misc") endif() diff --git a/compiler-rt/test/shadowcallstack/CMakeLists.txt b/compiler-rt/test/shadowcallstack/CMakeLists.txt index 0333eb6fd6b76..0b9a658dd36ec 100644 --- a/compiler-rt/test/shadowcallstack/CMakeLists.txt +++ b/compiler-rt/test/shadowcallstack/CMakeLists.txt @@ -18,4 +18,3 @@ endforeach() add_lit_testsuite(check-shadowcallstack "Running the ShadowCallStack tests" ${SHADOWCALLSTACK_TESTSUITES} DEPENDS ${SANITIZER_COMMON_LIT_TEST_DEPS}) -set_target_properties(check-shadowcallstack PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/tsan/CMakeLists.txt b/compiler-rt/test/tsan/CMakeLists.txt index ebd8ddf639df9..31cda53efd47f 100644 --- a/compiler-rt/test/tsan/CMakeLists.txt +++ b/compiler-rt/test/tsan/CMakeLists.txt @@ -137,5 +137,4 @@ if(COMPILER_RT_TSAN_HAS_STATIC_RUNTIME) ${TSAN_DYNAMIC_TESTSUITES} EXCLUDE_FROM_CHECK_ALL DEPENDS ${TSAN_DYNAMIC_TEST_DEPS}) - set_target_properties(check-tsan-dynamic PROPERTIES FOLDER "Compiler-RT Misc") endif() diff --git a/compiler-rt/test/ubsan/CMakeLists.txt b/compiler-rt/test/ubsan/CMakeLists.txt index 52052c80960c2..d95f9ad649ebf 100644 --- a/compiler-rt/test/ubsan/CMakeLists.txt +++ b/compiler-rt/test/ubsan/CMakeLists.txt @@ -133,5 +133,3 @@ endif() add_lit_testsuite(check-ubsan "Running UndefinedBehaviorSanitizer tests" ${UBSAN_TESTSUITES} DEPENDS ${UBSAN_TEST_DEPS}) -set_target_properties(check-ubsan PROPERTIES FOLDER "Compiler-RT Misc") - diff --git a/compiler-rt/test/ubsan_minimal/CMakeLists.txt b/compiler-rt/test/ubsan_minimal/CMakeLists.txt index c2debeae07e82..e214397b492dc 100644 --- a/compiler-rt/test/ubsan_minimal/CMakeLists.txt +++ b/compiler-rt/test/ubsan_minimal/CMakeLists.txt @@ -21,4 +21,3 @@ endforeach() add_lit_testsuite(check-ubsan-minimal "Running UndefinedBehaviorSanitizerMinimal tests" ${UBSAN_TESTSUITES} DEPENDS ${UBSAN_TEST_DEPS}) -set_target_properties(check-ubsan-minimal PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/compiler-rt/test/xray/CMakeLists.txt b/compiler-rt/test/xray/CMakeLists.txt index 0c008b6ea5577..fd2a2f43e195d 100644 --- a/compiler-rt/test/xray/CMakeLists.txt +++ b/compiler-rt/test/xray/CMakeLists.txt @@ -29,4 +29,3 @@ endif() add_lit_testsuite(check-xray "Running the XRay tests" ${XRAY_TESTSUITES} DEPENDS ${XRAY_TEST_DEPS}) -set_target_properties(check-xray PROPERTIES FOLDER "Compiler-RT Misc") diff --git a/cross-project-tests/CMakeLists.txt b/cross-project-tests/CMakeLists.txt index f7c2ca7ad83de..7f2fee48fda77 100644 --- a/cross-project-tests/CMakeLists.txt +++ b/cross-project-tests/CMakeLists.txt @@ -3,6 +3,7 @@ # The subset inside debuginfo-tests invoke clang to generate programs with # various types of debug info, and then run those programs under a debugger # such as GDB or LLDB to verify the results. +set(LLVM_SUBPROJECT_TITLE "Cross-Project") find_package(Python3 COMPONENTS Interpreter) @@ -97,8 +98,3 @@ add_lit_testsuite(check-cross-amdgpu "Running AMDGPU cross-project tests" add_lit_testsuites(CROSS_PROJECT ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${CROSS_PROJECT_TEST_DEPS} ) - -set_target_properties(check-cross-project PROPERTIES FOLDER "Tests") -set_target_properties(check-debuginfo PROPERTIES FOLDER "Tests") -set_target_properties(check-intrinsic-headers PROPERTIES FOLDER "Tests") -set_target_properties(check-cross-amdgpu PROPERTIES FOLDER "Tests") diff --git a/flang/CMakeLists.txt b/flang/CMakeLists.txt index c8e75024823f2..3bc4b5dd10c0e 100644 --- a/flang/CMakeLists.txt +++ b/flang/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "Flang") if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) @@ -481,7 +482,7 @@ endif() # Custom target to install Flang libraries. add_custom_target(flang-libraries) -set_target_properties(flang-libraries PROPERTIES FOLDER "Misc") +set_target_properties(flang-libraries PROPERTIES FOLDER "Flang/Meta") if (NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-flang-libraries diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake index 41ce8738e7bf2..3a5119b83831f 100644 --- a/flang/cmake/modules/AddFlang.cmake +++ b/flang/cmake/modules/AddFlang.cmake @@ -94,13 +94,12 @@ function(add_flang_library name) add_custom_target(${name}) endif() - set_target_properties(${name} PROPERTIES FOLDER "Flang libraries") + set_target_properties(${name} PROPERTIES FOLDER "Flang/Libraries") set_flang_windows_version_resource_properties(${name}) endfunction(add_flang_library) macro(add_flang_executable name) add_llvm_executable(${name} ${ARGN}) - set_target_properties(${name} PROPERTIES FOLDER "Flang executables") set_flang_windows_version_resource_properties(${name}) endmacro(add_flang_executable) diff --git a/flang/docs/CMakeLists.txt b/flang/docs/CMakeLists.txt index 3414b8e3acc46..3e4883e881ffa 100644 --- a/flang/docs/CMakeLists.txt +++ b/flang/docs/CMakeLists.txt @@ -79,7 +79,7 @@ if (LLVM_ENABLE_DOXYGEN) COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating flang doxygen documentation." VERBATIM) - + set_target_properties(doxygen-flang PROPERTIES FOLDER "Flang/Docs") if (LLVM_BUILD_DOCS) add_dependencies(doxygen doxygen-flang) endif() diff --git a/flang/include/flang/Optimizer/Dialect/CMakeLists.txt b/flang/include/flang/Optimizer/Dialect/CMakeLists.txt index f00993d4d3778..203ac212d3ccf 100644 --- a/flang/include/flang/Optimizer/Dialect/CMakeLists.txt +++ b/flang/include/flang/Optimizer/Dialect/CMakeLists.txt @@ -31,6 +31,7 @@ mlir_tablegen(CanonicalizationPatterns.inc -gen-rewriters) add_public_tablegen_target(CanonicalizationPatternsIncGen) add_custom_target(flang-doc) +set_target_properties(flang-doc PROPERTIES FOLDER "Flang/Meta") set(dialect_doc_filename "FIRLangRef") set(LLVM_TARGET_DEFINITIONS FIROps.td) @@ -43,4 +44,5 @@ add_custom_command( ${GEN_DOC_FILE} DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${dialect_doc_filename}.md) add_custom_target(${dialect_doc_filename}DocGen DEPENDS ${GEN_DOC_FILE}) +set_target_properties(${dialect_doc_filename}DocGen PROPERTIES FOLDER "Flang/Docs") add_dependencies(flang-doc ${dialect_doc_filename}DocGen) diff --git a/flang/runtime/CMakeLists.txt b/flang/runtime/CMakeLists.txt index bdd0e07bbfd4d..eaa79851046c6 100644 --- a/flang/runtime/CMakeLists.txt +++ b/flang/runtime/CMakeLists.txt @@ -269,21 +269,26 @@ else() LINK_LIBS FortranDecimal.static INSTALL_WITH_TOOLCHAIN) + set_target_properties(FortranRuntime.static PROPERTIES FOLDER "Flang/Runtime Libraries") set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDLL) add_flang_library(FortranRuntime.dynamic ${sources} LINK_LIBS FortranDecimal.dynamic INSTALL_WITH_TOOLCHAIN) + set_target_properties(FortranRuntime.dynamic PROPERTIES FOLDER "Flang/Runtime Libraries") set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDebug) add_flang_library(FortranRuntime.static_dbg ${sources} LINK_LIBS FortranDecimal.static_dbg INSTALL_WITH_TOOLCHAIN) + set_target_properties(FortranRuntime.static_dbg PROPERTIES FOLDER "Flang/Runtime Libraries") set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDebugDLL) add_flang_library(FortranRuntime.dynamic_dbg ${sources} LINK_LIBS FortranDecimal.dynamic_dbg INSTALL_WITH_TOOLCHAIN) + set_target_properties(FortranRuntime.dynamic_dbg PROPERTIES FOLDER "Flang/Runtime Libraries") add_dependencies(FortranRuntime FortranRuntime.static FortranRuntime.dynamic FortranRuntime.static_dbg FortranRuntime.dynamic_dbg) endif() +set_target_properties(FortranRuntime PROPERTIES FOLDER "Flang/Runtime Libraries") diff --git a/flang/test/CMakeLists.txt b/flang/test/CMakeLists.txt index 7d96a72e5f36d..b6e2fd6f98eed 100644 --- a/flang/test/CMakeLists.txt +++ b/flang/test/CMakeLists.txt @@ -84,13 +84,14 @@ if (LLVM_BUILD_EXAMPLES) endif () add_custom_target(flang-test-depends DEPENDS ${FLANG_TEST_DEPENDS}) +set_target_properties(flang-test-depends PROPERTIES FOLDER "Flang/Meta") add_lit_testsuite(check-flang "Running the Flang regression tests" ${CMAKE_CURRENT_BINARY_DIR} PARAMS ${FLANG_TEST_PARAMS} DEPENDS ${FLANG_TEST_DEPENDS} ) -set_target_properties(check-flang PROPERTIES FOLDER "Tests") +set_target_properties(check-flang PROPERTIES FOLDER "Flang/Meta") # In case of standalone builds. if (FLANG_STANDALONE_BUILD) diff --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt index 64815a1f5da62..2aa793592226b 100644 --- a/flang/tools/f18/CMakeLists.txt +++ b/flang/tools/f18/CMakeLists.txt @@ -92,6 +92,7 @@ if (NOT CMAKE_CROSSCOMPILING) endif() add_custom_target(module_files ALL DEPENDS ${MODULE_FILES}) +set_target_properties(module_files PROPERTIES FOLDER "Flang/Resources") # TODO Move this to a more suitable location # Copy the generated omp_lib.h header file, if OpenMP support has been configured. diff --git a/flang/unittests/CMakeLists.txt b/flang/unittests/CMakeLists.txt index 72d37ebeb853c..945067fed4f82 100644 --- a/flang/unittests/CMakeLists.txt +++ b/flang/unittests/CMakeLists.txt @@ -8,7 +8,7 @@ if (FLANG_EXPERIMENTAL_CUDA_RUNTIME) endif() add_custom_target(FlangUnitTests) -set_target_properties(FlangUnitTests PROPERTIES FOLDER "Flang Unit Tests") +set_target_properties(FlangUnitTests PROPERTIES FOLDER "Flang/Tests") function(add_flang_unittest_offload_properties target) # Set CUDA_RESOLVE_DEVICE_SYMBOLS. @@ -55,6 +55,7 @@ function(add_flang_nongtest_unittest test_name) endif() add_executable(${test_name}${suffix} ${test_name}.cpp) + set_target_properties(${test_name}${suffix} PROPERTIES FOLDER "Flang/Tests/Unit") if (LLVM_LINK_LLVM_DYLIB AND NOT ARG_DISABLE_LLVM_LINK_LLVM_DYLIB) set(llvm_libs LLVM) diff --git a/flang/unittests/Evaluate/CMakeLists.txt b/flang/unittests/Evaluate/CMakeLists.txt index 4658d8d3345b5..52eb385f4763f 100644 --- a/flang/unittests/Evaluate/CMakeLists.txt +++ b/flang/unittests/Evaluate/CMakeLists.txt @@ -3,6 +3,7 @@ add_library(FortranEvaluateTesting testing.cpp fp-testing.cpp ) +set_target_properties(FortranEvaluateTesting PROPERTIES FOLDER "Flang/Tests") if (LLVM_LINK_LLVM_DYLIB) set(llvm_libs LLVM) else() diff --git a/libc/CMakeLists.txt b/libc/CMakeLists.txt index 175efd89d67e6..f35471a06a53e 100644 --- a/libc/CMakeLists.txt +++ b/libc/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "libc") # Include LLVM's cmake policies. if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) diff --git a/libclc/CMakeLists.txt b/libclc/CMakeLists.txt index 5ce1795243085..05e0061d42298 100644 --- a/libclc/CMakeLists.txt +++ b/libclc/CMakeLists.txt @@ -1,6 +1,7 @@ cmake_minimum_required(VERSION 3.20.0) project( libclc VERSION 0.2.0 LANGUAGES CXX C) +set(LLVM_SUBPROJECT_TITLE "libclc") set(CMAKE_CXX_STANDARD 17) @@ -54,7 +55,10 @@ if( LIBCLC_STANDALONE_BUILD OR CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DI foreach( tool IN ITEMS clang llvm-as llvm-link opt ) find_program( LLVM_TOOL_${tool} ${tool} PATHS ${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH ) add_executable( libclc::${tool} IMPORTED GLOBAL ) - set_target_properties( libclc::${tool} PROPERTIES IMPORTED_LOCATION ${LLVM_TOOL_${tool}} ) + set_target_properties( libclc::${tool} PROPERTIES + IMPORTED_LOCATION ${LLVM_TOOL_${tool}} + FOLDER "libclc/Tools" + ) endforeach() endif() else() @@ -168,6 +172,7 @@ if( LIBCLC_STANDALONE_BUILD ) else() add_llvm_utility( prepare_builtins utils/prepare-builtins.cpp ) endif() +set_target_properties( prepare_builtins PROPERTIES FOLDER "libclc/Tablegenning") target_compile_definitions( prepare_builtins PRIVATE ${LLVM_VERSION_DEFINE} ) # These were not properly reported in early LLVM and we don't need them target_compile_options( prepare_builtins PRIVATE -fno-rtti -fno-exceptions ) @@ -225,12 +230,14 @@ add_custom_command( COMMAND ${Python3_EXECUTABLE} ${script_loc} > convert.cl DEPENDS ${script_loc} ) add_custom_target( "generate_convert.cl" DEPENDS convert.cl ) +set_target_properties( "generate_convert.cl" PROPERTIES FOLDER "libclc/Tablegenning" ) add_custom_command( OUTPUT clspv-convert.cl COMMAND ${Python3_EXECUTABLE} ${script_loc} --clspv > clspv-convert.cl DEPENDS ${script_loc} ) add_custom_target( "clspv-generate_convert.cl" DEPENDS clspv-convert.cl ) +set_target_properties( "clspv-generate_convert.cl" PROPERTIES FOLDER "libclc/Tablegenning" ) enable_testing() @@ -394,6 +401,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) DEPENDS ${builtins_link_lib} ) add_custom_target( "prepare-${spv_suffix}" ALL DEPENDS "${spv_suffix}" ) + set_target_properties( "prepare-${spv_suffix}" PROPERTIES FOLDER "libclc/Tablegenning" ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${spv_suffix} DESTINATION "${CMAKE_INSTALL_DATADIR}/clc" ) else() @@ -410,6 +418,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) ) set_target_properties( ${builtins_opt_lib_tgt} PROPERTIES TARGET_FILE ${builtins_opt_lib_tgt}.bc + FOLDER "libclc/BC Genning" ) set( builtins_opt_lib $ ) @@ -420,6 +429,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) COMMAND prepare_builtins -o ${obj_suffix} ${builtins_opt_lib} DEPENDS ${builtins_opt_lib} prepare_builtins ) add_custom_target( prepare-${obj_suffix} ALL DEPENDS ${obj_suffix} ) + set_target_properties( "prepare-${obj_suffix}" PROPERTIES FOLDER "libclc/BC Genning" ) # nvptx-- targets don't include workitem builtins if( NOT clang_triple MATCHES ".*ptx.*--$" ) @@ -434,6 +444,7 @@ foreach( t ${LIBCLC_TARGETS_TO_BUILD} ) add_custom_target( ${alias_suffix} ALL COMMAND ${CMAKE_COMMAND} -E create_symlink ${obj_suffix} ${alias_suffix} DEPENDS prepare-${obj_suffix} ) + set_target_properties( "${alias_suffix}" PROPERTIES FOLDER "libclc/BC Genning" ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${alias_suffix} DESTINATION "${CMAKE_INSTALL_DATADIR}/clc" ) endforeach( a ) endif() diff --git a/libclc/cmake/modules/AddLibclc.cmake b/libclc/cmake/modules/AddLibclc.cmake index bbedc244a7289..b358f871a251d 100644 --- a/libclc/cmake/modules/AddLibclc.cmake +++ b/libclc/cmake/modules/AddLibclc.cmake @@ -95,7 +95,10 @@ function(link_bc) ) add_custom_target( ${ARG_TARGET} ALL DEPENDS ${ARG_TARGET}.bc ) - set_target_properties( ${ARG_TARGET} PROPERTIES TARGET_FILE ${ARG_TARGET}.bc ) + set_target_properties( ${ARG_TARGET} PROPERTIES + TARGET_FILE ${ARG_TARGET}.bc + FOLDER "libclc/BC Genning" + ) endfunction() # Decomposes and returns variables based on a libclc triple and architecture diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt index 2977c26646cb2..d75f22ecf0222 100644 --- a/libcxx/CMakeLists.txt +++ b/libcxx/CMakeLists.txt @@ -5,6 +5,7 @@ # Setup Project #=============================================================================== cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "libc++") set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt index da998d2221dc4..f7673da25d20e 100644 --- a/libcxxabi/CMakeLists.txt +++ b/libcxxabi/CMakeLists.txt @@ -5,6 +5,7 @@ #=============================================================================== cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "libc++abi") set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt index 806d5a783ec39..2117cd9e756ef 100644 --- a/libunwind/CMakeLists.txt +++ b/libunwind/CMakeLists.txt @@ -3,6 +3,7 @@ #=============================================================================== cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "libunwind") set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt index cd8ba627306ed..64c9f23805509 100644 --- a/lld/CMakeLists.txt +++ b/lld/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "LLD") if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) @@ -192,6 +193,7 @@ add_subdirectory(tools/lld) if (LLVM_INCLUDE_TESTS) add_custom_target(LLDUnitTests) + set_target_properties(LLDUnitTests PROPERTIES FOLDER "LLD/Tests") if (TARGET llvm_gtest) add_subdirectory(unittests) endif() diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake index 2ee066b415351..9f2684b6f933e 100644 --- a/lld/cmake/modules/AddLLD.cmake +++ b/lld/cmake/modules/AddLLD.cmake @@ -11,7 +11,6 @@ macro(add_lld_library name) set(ARG_ENABLE_SHARED SHARED) endif() llvm_add_library(${name} ${ARG_ENABLE_SHARED} ${ARG_UNPARSED_ARGUMENTS}) - set_target_properties(${name} PROPERTIES FOLDER "lld libraries") if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) get_target_export_arg(${name} LLD export_to_lldtargets) @@ -33,7 +32,6 @@ endmacro(add_lld_library) macro(add_lld_executable name) add_llvm_executable(${name} ${ARGN}) - set_target_properties(${name} PROPERTIES FOLDER "lld executables") endmacro(add_lld_executable) macro(add_lld_tool name) diff --git a/lld/test/CMakeLists.txt b/lld/test/CMakeLists.txt index bb6164f19dcef..25d8f0a424926 100644 --- a/lld/test/CMakeLists.txt +++ b/lld/test/CMakeLists.txt @@ -83,10 +83,9 @@ add_lit_testsuite(check-lld "Running lld test suite" ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${LLD_TEST_DEPS} ) -set_target_properties(check-lld PROPERTIES FOLDER "lld tests") add_custom_target(lld-test-depends DEPENDS ${LLD_TEST_DEPS}) -set_target_properties(lld-test-depends PROPERTIES FOLDER "lld tests") +set_target_properties(lld-test-depends PROPERTIES FOLDER "LLD/Tests") add_lit_testsuites(LLD ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${LLD_TEST_DEPS} @@ -95,4 +94,4 @@ add_lit_testsuites(LLD ${CMAKE_CURRENT_SOURCE_DIR} # Add a legacy target spelling: lld-test add_custom_target(lld-test) add_dependencies(lld-test check-lld) -set_target_properties(lld-test PROPERTIES FOLDER "lld tests") +set_target_properties(lld-test PROPERTIES FOLDER "LLD/Tests") diff --git a/lld/unittests/CMakeLists.txt b/lld/unittests/CMakeLists.txt index ac878fa019083..ffaea3f207833 100644 --- a/lld/unittests/CMakeLists.txt +++ b/lld/unittests/CMakeLists.txt @@ -1,5 +1,3 @@ -set_target_properties(LLDUnitTests PROPERTIES FOLDER "lld tests") - function(add_lld_unittests test_dirname) add_unittest(LLDUnitTests ${test_dirname} ${ARGN}) endfunction() diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt index 7844d93d78d29..db9e5517e287b 100644 --- a/lldb/CMakeLists.txt +++ b/lldb/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "LLDB") if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake index fdc4ee0c05d75..538029037dd46 100644 --- a/lldb/cmake/modules/AddLLDB.cmake +++ b/lldb/cmake/modules/AddLLDB.cmake @@ -29,7 +29,6 @@ function(lldb_tablegen) if(LTG_TARGET) add_public_tablegen_target(${LTG_TARGET}) - set_target_properties( ${LTG_TARGET} PROPERTIES FOLDER "LLDB tablegenning") set_property(GLOBAL APPEND PROPERTY LLDB_TABLEGEN_TARGETS ${LTG_TARGET}) endif() endfunction(lldb_tablegen) @@ -165,10 +164,10 @@ function(add_lldb_library name) get_property(parent_dir DIRECTORY PROPERTY PARENT_DIRECTORY) if(EXISTS ${parent_dir}) get_filename_component(category ${parent_dir} NAME) - set_target_properties(${name} PROPERTIES FOLDER "lldb plugins/${category}") + set_target_properties(${name} PROPERTIES FOLDER "LLDB/Plugins/${category}") endif() else() - set_target_properties(${name} PROPERTIES FOLDER "lldb libraries") + set_target_properties(${name} PROPERTIES FOLDER "LLDB/Libraries") endif() # If we want to export all lldb symbols (i.e LLDB_EXPORT_ALL_SYMBOLS=ON), we @@ -208,7 +207,6 @@ function(add_lldb_executable name) else() target_link_libraries(${name} PRIVATE ${ARG_CLANG_LIBS}) endif() - set_target_properties(${name} PROPERTIES FOLDER "lldb executables") if (ARG_BUILD_RPATH) set_target_properties(${name} PROPERTIES BUILD_RPATH "${ARG_BUILD_RPATH}") diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake index a758261073ac5..13d07a4fabd6d 100644 --- a/lldb/cmake/modules/LLDBConfig.cmake +++ b/lldb/cmake/modules/LLDBConfig.cmake @@ -271,7 +271,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) ) add_custom_target(lldb-headers) - set_target_properties(lldb-headers PROPERTIES FOLDER "lldb misc") + set_target_properties(lldb-headers PROPERTIES FOLDER "LLDB/Resources") if (NOT CMAKE_CONFIGURATION_TYPES) add_llvm_install_targets(install-lldb-headers diff --git a/lldb/cmake/modules/LLDBFramework.cmake b/lldb/cmake/modules/LLDBFramework.cmake index f915839f6b45a..88ea6a568ec4c 100644 --- a/lldb/cmake/modules/LLDBFramework.cmake +++ b/lldb/cmake/modules/LLDBFramework.cmake @@ -104,7 +104,7 @@ endforeach() # Wrap output in a target, so lldb-framework can depend on it. add_custom_target(liblldb-resource-headers DEPENDS ${lldb_staged_headers}) -set_target_properties(liblldb-resource-headers PROPERTIES FOLDER "lldb misc") +set_target_properties(liblldb-resource-headers PROPERTIES FOLDER "LLDB/Resources") add_dependencies(liblldb liblldb-resource-headers) # At build time, copy the staged headers into the framework bundle (and do diff --git a/lldb/cmake/modules/LLDBStandalone.cmake b/lldb/cmake/modules/LLDBStandalone.cmake index fd16716d71419..c9367214848fd 100644 --- a/lldb/cmake/modules/LLDBStandalone.cmake +++ b/lldb/cmake/modules/LLDBStandalone.cmake @@ -118,8 +118,8 @@ if(LLVM_USE_FOLDERS) set_property(GLOBAL PROPERTY USE_FOLDERS ON) endif() -set_target_properties(clang-tablegen-targets PROPERTIES FOLDER "lldb misc") -set_target_properties(intrinsics_gen PROPERTIES FOLDER "lldb misc") +set_target_properties(clang-tablegen-targets PROPERTIES FOLDER "Clang/Tablegenning") +set_target_properties(intrinsics_gen PROPERTIES FOLDER "LLVM/Tablegenning") if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) diff --git a/lldb/docs/CMakeLists.txt b/lldb/docs/CMakeLists.txt index af18eb22e9546..f482e91d1b10c 100644 --- a/lldb/docs/CMakeLists.txt +++ b/lldb/docs/CMakeLists.txt @@ -13,6 +13,7 @@ if(DOXYGEN_FOUND) WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating LLDB C++ API reference with Doxygen" VERBATIM ) + set_target_properties(lldb-cpp-doc PROPERTIES FOLDER "LLDB/Docs") endif() if (LLVM_ENABLE_SPHINX) diff --git a/lldb/source/API/CMakeLists.txt b/lldb/source/API/CMakeLists.txt index 57cc44f764675..42c1afd23a05c 100644 --- a/lldb/source/API/CMakeLists.txt +++ b/lldb/source/API/CMakeLists.txt @@ -193,7 +193,6 @@ if (NOT CMAKE_SYSTEM_NAME MATCHES "Windows") "Only the SB API is guaranteed to be stable.") add_llvm_symbol_exports(liblldb "${LLDB_EXPORT_ALL_SYMBOLS_EXPORTS_FILE}") endif() - set_target_properties(liblldb_exports PROPERTIES FOLDER "lldb misc") elseif (LLDB_EXPORT_ALL_SYMBOLS) MESSAGE("-- Symbols (liblldb): exporting all symbols from the lldb and lldb_private namespaces") @@ -232,7 +231,7 @@ elseif (LLDB_EXPORT_ALL_SYMBOLS) ) add_llvm_symbol_exports(liblldb ${exported_symbol_file}) - set_target_properties(liblldb_exports PROPERTIES FOLDER "lldb misc") + set_target_properties(liblldb PROPERTIES FOLDER "LLDB/Misc") endif() if (NOT MSVC) diff --git a/lldb/test/API/CMakeLists.txt b/lldb/test/API/CMakeLists.txt index 9196f54ce1ae3..856beb894208c 100644 --- a/lldb/test/API/CMakeLists.txt +++ b/lldb/test/API/CMakeLists.txt @@ -1,4 +1,5 @@ add_custom_target(lldb-api-test-deps) +set_target_properties(lldb-api-test-deps PROPERTIES FOLDER "LLDB/Tests") add_dependencies(lldb-api-test-deps lldb-test-depends) add_lit_testsuites(LLDB-API diff --git a/lldb/test/CMakeLists.txt b/lldb/test/CMakeLists.txt index 6a9ca59f96b0f..5ac474736eb63 100644 --- a/lldb/test/CMakeLists.txt +++ b/lldb/test/CMakeLists.txt @@ -91,10 +91,11 @@ string(REPLACE ${CMAKE_CFG_INTDIR} ${LLVM_BUILD_MODE} LLDB_TOOLS_DIR ${LLVM_RUNT # Create a custom target to track test dependencies. add_custom_target(lldb-test-depends) -set_target_properties(lldb-test-depends PROPERTIES FOLDER "lldb misc") +set_target_properties(lldb-test-depends PROPERTIES FOLDER "LLDB/Tests") # Create an alias for the legacy name of lldb-test-depends add_custom_target(lldb-test-deps) +set_target_properties(lldb-test-deps PROPERTIES FOLDER "LLDB/Tests") add_dependencies(lldb-test-deps lldb-test-depends) function(add_lldb_test_dependency) @@ -265,7 +266,6 @@ add_lit_testsuite(check-lldb "Running lldb lit test suite" lldb-api-test-deps lldb-shell-test-deps lldb-unit-test-deps) -set_target_properties(check-lldb PROPERTIES FOLDER "lldb tests") if(LLDB_BUILT_STANDALONE) # This has to happen *AFTER* add_lit_testsuite. diff --git a/lldb/test/Shell/CMakeLists.txt b/lldb/test/Shell/CMakeLists.txt index 221033bb05eb2..97323ff6fbc31 100644 --- a/lldb/test/Shell/CMakeLists.txt +++ b/lldb/test/Shell/CMakeLists.txt @@ -1,4 +1,5 @@ add_custom_target(lldb-shell-test-deps) +set_target_properties(lldb-shell-test-deps PROPERTIES FOLDER "LLDB/Tests") add_dependencies(lldb-shell-test-deps lldb-test-depends) add_lit_testsuites(LLDB-SHELL diff --git a/lldb/test/Unit/CMakeLists.txt b/lldb/test/Unit/CMakeLists.txt index a592e1cb1a1fc..b86f1e0f5ed20 100644 --- a/lldb/test/Unit/CMakeLists.txt +++ b/lldb/test/Unit/CMakeLists.txt @@ -1,4 +1,5 @@ add_custom_target(lldb-unit-test-deps) +set_target_properties(lldb-unit-test-deps PROPERTIES FOLDER "LLDB/Tests") add_dependencies(lldb-unit-test-deps lldb-test-depends) add_lit_testsuites(LLDB-UNIT diff --git a/lldb/tools/driver/CMakeLists.txt b/lldb/tools/driver/CMakeLists.txt index c93cd171b92b4..cd304a047dea6 100644 --- a/lldb/tools/driver/CMakeLists.txt +++ b/lldb/tools/driver/CMakeLists.txt @@ -28,8 +28,6 @@ add_dependencies(lldb ${tablegen_deps} ) -set_target_properties(LLDBOptionsTableGen PROPERTIES FOLDER "lldb misc") - if(LLDB_BUILD_FRAMEWORK) # In the build-tree, we know the exact path to the framework directory. # The installed framework can be in different locations. diff --git a/lldb/tools/lldb-fuzzer/lldb-commandinterpreter-fuzzer/CMakeLists.txt b/lldb/tools/lldb-fuzzer/lldb-commandinterpreter-fuzzer/CMakeLists.txt index 7eb85ba916709..0ef30be8f9d3a 100644 --- a/lldb/tools/lldb-fuzzer/lldb-commandinterpreter-fuzzer/CMakeLists.txt +++ b/lldb/tools/lldb-fuzzer/lldb-commandinterpreter-fuzzer/CMakeLists.txt @@ -29,4 +29,5 @@ if(TARGET lldb-commandinterpreter-fuzzer) COMMAND $ -dict=${CMAKE_CURRENT_SOURCE_DIR}/inputdictionary.txt -only_ascii=1 -artifact_prefix=commandinterpreter- USES_TERMINAL ) + set_target_properties(fuzz-lldb-commandinterpreter PROPERTIES FOLDER "LLDB/Fuzzer") endif() diff --git a/lldb/tools/lldb-fuzzer/lldb-target-fuzzer/CMakeLists.txt b/lldb/tools/lldb-fuzzer/lldb-target-fuzzer/CMakeLists.txt index 6876945c08da6..c71b2731ef769 100644 --- a/lldb/tools/lldb-fuzzer/lldb-target-fuzzer/CMakeLists.txt +++ b/lldb/tools/lldb-fuzzer/lldb-target-fuzzer/CMakeLists.txt @@ -25,4 +25,5 @@ if(TARGET lldb-target-fuzzer) COMMAND $ -artifact_prefix=target- USES_TERMINAL ) + set_target_properties(fuzz-lldb-target PROPERTIES FOLDER "LLDB/Fuzzer") endif() diff --git a/lldb/tools/lldb-server/CMakeLists.txt b/lldb/tools/lldb-server/CMakeLists.txt index 67103e87a1d4a..9030ed709a647 100644 --- a/lldb/tools/lldb-server/CMakeLists.txt +++ b/lldb/tools/lldb-server/CMakeLists.txt @@ -1,7 +1,6 @@ set(LLVM_TARGET_DEFINITIONS LLGSOptions.td) tablegen(LLVM LLGSOptions.inc -gen-opt-parser-defs) add_public_tablegen_target(LLGSOptionsTableGen) -set_target_properties(LLGSOptionsTableGen PROPERTIES FOLDER "lldb misc") set(LLDB_PLUGINS) diff --git a/lldb/unittests/CMakeLists.txt b/lldb/unittests/CMakeLists.txt index c084fa5cca92b..c92c28f7b6897 100644 --- a/lldb/unittests/CMakeLists.txt +++ b/lldb/unittests/CMakeLists.txt @@ -1,5 +1,5 @@ add_custom_target(LLDBUnitTests) -set_target_properties(LLDBUnitTests PROPERTIES FOLDER "lldb tests") +set_target_properties(LLDBUnitTests PROPERTIES FOLDER "LLDB/Tests") add_dependencies(lldb-unit-test-deps LLDBUnitTests) diff --git a/lldb/unittests/tools/lldb-server/CMakeLists.txt b/lldb/unittests/tools/lldb-server/CMakeLists.txt index 1a7603077b8d8..05a7ef7f66f2d 100644 --- a/lldb/unittests/tools/lldb-server/CMakeLists.txt +++ b/lldb/unittests/tools/lldb-server/CMakeLists.txt @@ -7,7 +7,7 @@ function(add_lldb_test_executable test_name) set_output_directory(${test_name} BINARY_DIR ${outdir} LIBRARY_DIR ${outdir}) list(APPEND ALL_LLDB_TEST_EXECUTABLES ${test_name}) set(ALL_LLDB_TEST_EXECUTABLES ${ALL_LLDB_TEST_EXECUTABLES} PARENT_SCOPE) - set_target_properties(${test_name} PROPERTIES FOLDER "lldb tests") + set_target_properties(${test_name} PROPERTIES FOLDER "LLDB/Tests") endfunction() add_lldb_test_executable(thread_inferior inferior/thread_inferior.cpp) diff --git a/lldb/utils/TableGen/CMakeLists.txt b/lldb/utils/TableGen/CMakeLists.txt index 47a6400b4287e..0ac010bcda355 100644 --- a/lldb/utils/TableGen/CMakeLists.txt +++ b/lldb/utils/TableGen/CMakeLists.txt @@ -13,6 +13,5 @@ if (NOT DEFINED LLDB_TABLEGEN_EXE) LLDBTableGen.cpp LLDBTableGenUtils.cpp ) - set_target_properties(lldb-tblgen PROPERTIES FOLDER "LLDB tablegenning") endif() endif() diff --git a/lldb/utils/lit-cpuid/CMakeLists.txt b/lldb/utils/lit-cpuid/CMakeLists.txt index a151b986b551e..6ea7e1c5b4e18 100644 --- a/lldb/utils/lit-cpuid/CMakeLists.txt +++ b/lldb/utils/lit-cpuid/CMakeLists.txt @@ -6,4 +6,4 @@ add_lldb_executable(lit-cpuid TargetParser ) -set_target_properties(lit-cpuid PROPERTIES FOLDER "lldb utils") +set_target_properties(lit-cpuid PROPERTIES FOLDER "LLDB/Utils") diff --git a/lldb/utils/lldb-dotest/CMakeLists.txt b/lldb/utils/lldb-dotest/CMakeLists.txt index 09f41dbce421e..bb17a2ce017d5 100644 --- a/lldb/utils/lldb-dotest/CMakeLists.txt +++ b/lldb/utils/lldb-dotest/CMakeLists.txt @@ -1,7 +1,7 @@ # Make lldb-dotest a custom target. add_custom_target(lldb-dotest) add_dependencies(lldb-dotest lldb-test-depends) -set_target_properties(lldb-dotest PROPERTIES FOLDER "lldb utils") +set_target_properties(lldb-dotest PROPERTIES FOLDER "LLDB/Utils") get_property(LLDB_TEST_USER_ARGS GLOBAL PROPERTY LLDB_TEST_USER_ARGS_PROPERTY) get_property(LLDB_TEST_COMMON_ARGS GLOBAL PROPERTY LLDB_TEST_COMMON_ARGS_PROPERTY) diff --git a/lldb/utils/lldb-repro/CMakeLists.txt b/lldb/utils/lldb-repro/CMakeLists.txt index 725cb66c4755e..8ca02b9fb8193 100644 --- a/lldb/utils/lldb-repro/CMakeLists.txt +++ b/lldb/utils/lldb-repro/CMakeLists.txt @@ -1,6 +1,6 @@ add_custom_target(lldb-repro) add_dependencies(lldb-repro lldb-test-depends) -set_target_properties(lldb-repro PROPERTIES FOLDER "lldb utils") +set_target_properties(lldb-repro PROPERTIES FOLDER "LLDB/Utils") # Generate lldb-repro Python script for each build mode. if(LLDB_BUILT_STANDALONE) diff --git a/llvm-libgcc/CMakeLists.txt b/llvm-libgcc/CMakeLists.txt index 013c9ca2e3307..c6641ab9e3219 100644 --- a/llvm-libgcc/CMakeLists.txt +++ b/llvm-libgcc/CMakeLists.txt @@ -3,6 +3,7 @@ #=============================================================================== cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "LLVM libgcc") set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index d511376e18ba5..26df1c8ea8598 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -1124,7 +1124,7 @@ configure_file( add_custom_target(srpm COMMAND cpack -G TGZ --config CPackSourceConfig.cmake -B ${LLVM_SRPM_DIR}/SOURCES COMMAND rpmbuild -bs --define '_topdir ${LLVM_SRPM_DIR}' ${LLVM_SRPM_BINARY_SPECFILE}) -set_target_properties(srpm PROPERTIES FOLDER "Misc") +set_target_properties(srpm PROPERTIES FOLDER "LLVM/Misc") if(APPLE AND DARWIN_LTO_LIBRARY) set(CMAKE_EXE_LINKER_FLAGS @@ -1222,7 +1222,9 @@ if( LLVM_INCLUDE_UTILS ) add_subdirectory(utils/split-file) add_subdirectory(utils/mlgo-utils) if( LLVM_INCLUDE_TESTS ) + set(LLVM_SUBPROJECT_TITLE "Third-Party/Google Test") add_subdirectory(${LLVM_THIRD_PARTY_DIR}/unittest ${CMAKE_CURRENT_BINARY_DIR}/third-party/unittest) + set(LLVM_SUBPROJECT_TITLE) endif() else() if ( LLVM_INCLUDE_TESTS ) @@ -1286,7 +1288,7 @@ if( LLVM_INCLUDE_TESTS ) if(LLVM_ALL_LIT_DEPENDS OR LLVM_ALL_ADDITIONAL_TEST_DEPENDS) add_dependencies(test-depends ${LLVM_ALL_LIT_DEPENDS} ${LLVM_ALL_ADDITIONAL_TEST_DEPENDS}) endif() - set_target_properties(test-depends PROPERTIES FOLDER "Tests") + set_target_properties(test-depends PROPERTIES FOLDER "LLVM/Tests") add_dependencies(check-all test-depends) endif() @@ -1343,7 +1345,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) # Installing the headers needs to depend on generating any public # tablegen'd headers. add_custom_target(llvm-headers DEPENDS intrinsics_gen omp_gen) - set_target_properties(llvm-headers PROPERTIES FOLDER "Misc") + set_target_properties(llvm-headers PROPERTIES FOLDER "LLVM/Resources") if (NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-llvm-headers @@ -1353,7 +1355,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) # Custom target to install all libraries. add_custom_target(llvm-libraries) - set_target_properties(llvm-libraries PROPERTIES FOLDER "Misc") + set_target_properties(llvm-libraries PROPERTIES FOLDER "LLVM/Resources") if (NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-llvm-libraries @@ -1399,6 +1401,8 @@ if (LLVM_INCLUDE_BENCHMARKS) set(HAVE_STD_REGEX ON CACHE BOOL "OK" FORCE) add_subdirectory(${LLVM_THIRD_PARTY_DIR}/benchmark ${CMAKE_CURRENT_BINARY_DIR}/third-party/benchmark) + set_target_properties(benchmark PROPERTIES FOLDER "Third-Party/Google Benchmark") + set_target_properties(benchmark_main PROPERTIES FOLDER "Third-Party/Google Benchmark") add_subdirectory(benchmarks) endif() diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake index 693fd5669f63f..25e35e22ccb71 100644 --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/cmake/modules/AddLLVM.cmake @@ -4,6 +4,21 @@ include(LLVMProcessSources) include(LLVM-Config) include(DetermineGCCCompatible) +# get_subproject_title(titlevar) +# Set ${outvar} to the title of the current LLVM subproject (Clang, MLIR ...) +# +# The title is set in the subproject's top-level using the variable +# LLVM_SUBPROJECT_TITLE. If it does not exist, it is assumed it is LLVM itself. +# The title is not semantically significant, but use to create folders in +# CMake-generated IDE projects (Visual Studio/XCode). +function(get_subproject_title outvar) + if (LLVM_SUBPROJECT_TITLE) + set(${outvar} "${LLVM_SUBPROJECT_TITLE}" PARENT_SCOPE) + else () + set(${outvar} "LLVM" PARENT_SCOPE) + endif () +endfunction(get_subproject_title) + function(llvm_update_compile_flags name) get_property(sources TARGET ${name} PROPERTY SOURCES) if("${sources}" MATCHES "\\.c(;|$)") @@ -151,7 +166,8 @@ function(add_llvm_symbol_exports target_name export_file) endif() add_custom_target(${target_name}_exports DEPENDS ${native_export_file}) - set_target_properties(${target_name}_exports PROPERTIES FOLDER "Misc") + get_subproject_title(subproject_title) + set_target_properties(${target_name}_exports PROPERTIES FOLDER "${subproject_title}/Misc") get_property(srcs TARGET ${target_name} PROPERTY SOURCES) foreach(src ${srcs}) @@ -543,6 +559,8 @@ function(llvm_add_library name) endif() endif() + get_subproject_title(subproject_title) + # Generate objlib if((ARG_SHARED AND ARG_STATIC) OR ARG_OBJECT) # Generate an obj library for both targets. @@ -564,7 +582,7 @@ function(llvm_add_library name) # Bring in the target include directories from our original target. target_include_directories(${obj_name} PRIVATE $) - set_target_properties(${obj_name} PROPERTIES FOLDER "Object Libraries") + set_target_properties(${obj_name} PROPERTIES FOLDER "${subproject_title}/Object Libraries") if(ARG_DEPENDS) add_dependencies(${obj_name} ${ARG_DEPENDS}) endif() @@ -603,6 +621,7 @@ function(llvm_add_library name) LINK_LIBS ${ARG_LINK_LIBS} LINK_COMPONENTS ${ARG_LINK_COMPONENTS} ) + set_target_properties(${name_static} PROPERTIES FOLDER "${subproject_title}/Libraries") # Bring in the target link info from our original target. target_link_directories(${name_static} PRIVATE $) @@ -620,6 +639,7 @@ function(llvm_add_library name) else() add_library(${name} STATIC ${ALL_FILES}) endif() + set_target_properties(${name} PROPERTIES FOLDER "${subproject_title}/Libraries") if(ARG_COMPONENT_LIB) set_target_properties(${name} PROPERTIES LLVM_COMPONENT TRUE) @@ -796,6 +816,8 @@ function(add_llvm_install_targets target) endif() endforeach() + get_subproject_title(subproject_title) + add_custom_target(${target} DEPENDS ${file_dependencies} COMMAND "${CMAKE_COMMAND}" @@ -803,7 +825,7 @@ function(add_llvm_install_targets target) ${prefix_option} -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" USES_TERMINAL) - set_target_properties(${target} PROPERTIES FOLDER "Component Install Targets") + set_target_properties(${target} PROPERTIES FOLDER "${subproject_title}/Install") add_custom_target(${target}-stripped DEPENDS ${file_dependencies} COMMAND "${CMAKE_COMMAND}" @@ -812,7 +834,7 @@ function(add_llvm_install_targets target) -DCMAKE_INSTALL_DO_STRIP=1 -P "${CMAKE_BINARY_DIR}/cmake_install.cmake" USES_TERMINAL) - set_target_properties(${target}-stripped PROPERTIES FOLDER "Component Install Targets (Stripped)") + set_target_properties(${target}-stripped PROPERTIES FOLDER "${subproject_title}/Install") if(target_dependencies) add_dependencies(${target} ${target_dependencies}) add_dependencies(${target}-stripped ${target_dependencies}) @@ -832,6 +854,8 @@ endfunction() function(add_llvm_component_group name) cmake_parse_arguments(ARG "HAS_JIT" "" "LINK_COMPONENTS" ${ARGN}) add_custom_target(${name}) + get_subproject_title(subproject_title) + set_target_properties(${name} PROPERTIES FOLDER "${subproject_title}/Component Groups") if(ARG_HAS_JIT) set_property(TARGET ${name} PROPERTY COMPONENT_HAS_JIT ON) endif() @@ -865,6 +889,8 @@ function(add_llvm_component_library name) if(ARG_ADD_TO_COMPONENT) set_property(TARGET ${ARG_ADD_TO_COMPONENT} APPEND PROPERTY LLVM_LINK_COMPONENTS ${component_name}) + get_subproject_title(subproject_title) + set_target_properties(${name} PROPERTIES FOLDER "${subproject_title}/Libraries/${ARG_ADD_TO_COMPONENT}") endif() endfunction() @@ -921,10 +947,12 @@ macro(add_llvm_library name) endif() set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) endif() + + get_subproject_title(subproject_title) if (ARG_MODULE) - set_target_properties(${name} PROPERTIES FOLDER "Loadable modules") + set_target_properties(${name} PROPERTIES FOLDER "${subproject_title}/Loadable Modules") else() - set_target_properties(${name} PROPERTIES FOLDER "Libraries") + set_target_properties(${name} PROPERTIES FOLDER "${subproject_title}/Libraries") endif() endmacro(add_llvm_library name) @@ -948,7 +976,8 @@ macro(generate_llvm_objects name) add_dependencies(${obj_name} ${ARG_DEPENDS}) endif() - set_target_properties(${obj_name} PROPERTIES FOLDER "Object Libraries") + get_subproject_title(subproject_title) + set_target_properties(${obj_name} PROPERTIES FOLDER "${subproject_title}/Object Libraries") endif() if (ARG_GENERATE_DRIVER) @@ -999,6 +1028,8 @@ macro(add_llvm_executable name) else() add_executable(${name} ${ALL_FILES}) endif() + get_subproject_title(subproject_title) + set_target_properties(${name} PROPERTIES FOLDER "${subproject_title}/Executables") setup_dependency_debugging(${name} ${LLVM_COMMON_DEPENDS}) @@ -1418,8 +1449,9 @@ macro(llvm_add_tool project name) if( LLVM_BUILD_TOOLS ) set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS ${name}) endif() - set_target_properties(${name} PROPERTIES FOLDER "Tools") + get_subproject_title(subproject_title) endif() + set_target_properties(${name} PROPERTIES FOLDER "${subproject_title}/Tools") endmacro(llvm_add_tool project name) macro(add_llvm_tool name) @@ -1435,7 +1467,8 @@ macro(add_llvm_example name) if( LLVM_BUILD_EXAMPLES ) install(TARGETS ${name} RUNTIME DESTINATION "${LLVM_EXAMPLES_INSTALL_DIR}") endif() - set_target_properties(${name} PROPERTIES FOLDER "Examples") + get_subproject_title(subproject_title) + set_target_properties(${name} PROPERTIES FOLDER "${subproject_title}/Examples") endmacro(add_llvm_example name) macro(add_llvm_example_library name) @@ -1446,7 +1479,8 @@ macro(add_llvm_example_library name) add_llvm_library(${name} ${ARGN}) endif() - set_target_properties(${name} PROPERTIES FOLDER "Examples") + get_subproject_title(subproject_title) + set_target_properties(${name} PROPERTIES FOLDER "${subproject_title}/Examples") endmacro(add_llvm_example_library name) # This is a macro that is used to create targets for executables that are needed @@ -1457,7 +1491,8 @@ macro(add_llvm_utility name) endif() add_llvm_executable(${name} DISABLE_LLVM_LINK_LLVM_DYLIB ${ARGN}) - set_target_properties(${name} PROPERTIES FOLDER "Utils") + get_subproject_title(subproject_title) + set_target_properties(${name} PROPERTIES FOLDER "${subproject_title}/Utils") if ( ${name} IN_LIST LLVM_TOOLCHAIN_UTILITIES OR NOT LLVM_INSTALL_TOOLCHAIN_ONLY) if (LLVM_INSTALL_UTILS AND LLVM_BUILD_UTILS) get_target_export_arg(${name} LLVM export_to_llvmexports) @@ -1480,19 +1515,20 @@ endmacro(add_llvm_utility name) macro(add_llvm_fuzzer name) cmake_parse_arguments(ARG "" "DUMMY_MAIN" "" ${ARGN}) + get_subproject_title(subproject_title) if( LLVM_LIB_FUZZING_ENGINE ) set(LLVM_OPTIONAL_SOURCES ${ARG_DUMMY_MAIN}) add_llvm_executable(${name} ${ARG_UNPARSED_ARGUMENTS}) target_link_libraries(${name} PRIVATE ${LLVM_LIB_FUZZING_ENGINE}) - set_target_properties(${name} PROPERTIES FOLDER "Fuzzers") + set_target_properties(${name} PROPERTIES FOLDER "${subproject_title}/Fuzzers") elseif( LLVM_USE_SANITIZE_COVERAGE ) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=fuzzer") set(LLVM_OPTIONAL_SOURCES ${ARG_DUMMY_MAIN}) add_llvm_executable(${name} ${ARG_UNPARSED_ARGUMENTS}) - set_target_properties(${name} PROPERTIES FOLDER "Fuzzers") + set_target_properties(${name} PROPERTIES FOLDER "${subproject_title}/Fuzzers") elseif( ARG_DUMMY_MAIN ) add_llvm_executable(${name} ${ARG_DUMMY_MAIN} ${ARG_UNPARSED_ARGUMENTS}) - set_target_properties(${name} PROPERTIES FOLDER "Fuzzers") + set_target_properties(${name} PROPERTIES FOLDER "${subproject_title}/Fuzzers") endif() endmacro() @@ -1653,6 +1689,8 @@ function(add_unittest test_suite test_name) list(APPEND LLVM_LINK_COMPONENTS Support) # gtest needs it for raw_ostream add_llvm_executable(${test_name} IGNORE_EXTERNALIZE_DEBUGINFO NO_INSTALL_RPATH ${ARGN}) + get_subproject_title(subproject_title) + set_target_properties(${test_name} PROPERTIES FOLDER "${subproject_title}/Tests/Unit") # The runtime benefits of LTO don't outweight the compile time costs for tests. if(LLVM_ENABLE_LTO) @@ -1684,10 +1722,6 @@ function(add_unittest test_suite test_name) target_link_libraries(${test_name} PRIVATE llvm_gtest_main llvm_gtest ${LLVM_PTHREAD_LIB}) add_dependencies(${test_suite} ${test_name}) - get_target_property(test_suite_folder ${test_suite} FOLDER) - if (test_suite_folder) - set_property(TARGET ${test_name} PROPERTY FOLDER "${test_suite_folder}") - endif () endfunction() # Use for test binaries that call llvm::getInputFileDirectory(). Use of this @@ -1710,7 +1744,8 @@ function(add_benchmark benchmark_name) add_llvm_executable(${benchmark_name} IGNORE_EXTERNALIZE_DEBUGINFO NO_INSTALL_RPATH ${ARGN}) set(outdir ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}) set_output_directory(${benchmark_name} BINARY_DIR ${outdir} LIBRARY_DIR ${outdir}) - set_property(TARGET ${benchmark_name} PROPERTY FOLDER "Utils") + get_subproject_title(subproject_title) + set_property(TARGET ${benchmark_name} PROPERTY FOLDER "${subproject_title}/Utils") target_link_libraries(${benchmark_name} PRIVATE benchmark) endfunction() @@ -1999,6 +2034,8 @@ function(add_lit_target target comment) COMMAND ${CMAKE_COMMAND} -E echo "${target} does nothing, no tools built.") message(STATUS "${target} does nothing.") endif() + get_subproject_title(subproject_title) + set_target_properties(${target} PROPERTIES FOLDER "${subproject_title}/Tests") if (ARG_DEPENDS) add_dependencies(${target} ${ARG_DEPENDS}) @@ -2080,7 +2117,8 @@ function(add_lit_testsuites project directory) cmake_parse_arguments(ARG "EXCLUDE_FROM_CHECK_ALL" "FOLDER" "PARAMS;DEPENDS;ARGS" ${ARGN}) if (NOT ARG_FOLDER) - set(ARG_FOLDER "Test Subdirectories") + get_subproject_title(subproject_title) + set(ARG_FOLDER "${subproject_title}/Tests") endif() # Search recursively for test directories by assuming anything not @@ -2282,7 +2320,8 @@ function(llvm_add_tool_symlink project link_name target) set(should_build_all ALL) endif() add_custom_target(${target_name} ${should_build_all} DEPENDS ${target} ${output_path}) - set_target_properties(${target_name} PROPERTIES FOLDER Tools) + get_subproject_title(subproject_title) + set_target_properties(${target_name} PROPERTIES FOLDER "${subproject_title}/Tools") # Make sure both the link and target are toolchain tools if (${link_name} IN_LIST LLVM_TOOLCHAIN_TOOLS AND ${target} IN_LIST LLVM_TOOLCHAIN_TOOLS) @@ -2542,5 +2581,7 @@ function(setup_host_tool tool_name setting_name exe_var_name target_var_name) if(LLVM_USE_HOST_TOOLS AND NOT ${setting_name}) build_native_tool(${tool_name} exe_name DEPENDS ${tool_name}) add_custom_target(${target_var_name} DEPENDS ${exe_name}) + get_subproject_title(subproject_title) + set_target_properties(${target_var_name} PROPERTIES FOLDER "${subproject_title}/Native") endif() endfunction() diff --git a/llvm/cmake/modules/AddOCaml.cmake b/llvm/cmake/modules/AddOCaml.cmake index 891c9e6d618c0..01e736a68c3be 100644 --- a/llvm/cmake/modules/AddOCaml.cmake +++ b/llvm/cmake/modules/AddOCaml.cmake @@ -173,6 +173,7 @@ function(add_ocaml_library name) VERBATIM) add_custom_target("ocaml_${name}" ALL DEPENDS ${ocaml_outputs} "${bin}/${name}.odoc") + set_target_properties("ocaml_${name}" PROPERTIES FOLDER "LLVM/Bindings/OCaml") set_target_properties("ocaml_${name}" PROPERTIES OCAML_FLAGS "-I;${bin}") @@ -228,5 +229,5 @@ endfunction() add_custom_target(ocaml_make_directory COMMAND "${CMAKE_COMMAND}" "-E" "make_directory" "${LLVM_LIBRARY_DIR}/ocaml/llvm") add_custom_target("ocaml_all") -set_target_properties(ocaml_all PROPERTIES FOLDER "Misc") -set_target_properties(ocaml_make_directory PROPERTIES FOLDER "Misc") +set_target_properties(ocaml_all PROPERTIES FOLDER "LLVM/Bindings/OCaml") +set_target_properties(ocaml_make_directory PROPERTIES FOLDER "LLVM/Bindings/OCaml") diff --git a/llvm/cmake/modules/AddSphinxTarget.cmake b/llvm/cmake/modules/AddSphinxTarget.cmake index b90639fbbf073..9de169d7297cb 100644 --- a/llvm/cmake/modules/AddSphinxTarget.cmake +++ b/llvm/cmake/modules/AddSphinxTarget.cmake @@ -6,6 +6,7 @@ if (LLVM_ENABLE_SPHINX) find_package(Sphinx REQUIRED) if (LLVM_BUILD_DOCS AND NOT TARGET sphinx) add_custom_target(sphinx ALL) + set_target_properties(sphinx PROPERTIES FOLDER "LLVM/Docs") endif() else() message(STATUS "Sphinx disabled.") @@ -58,6 +59,8 @@ function (add_sphinx_target builder project) "${SPHINX_BUILD_DIR}" # Output COMMENT "Generating ${builder} Sphinx documentation for ${project} into \"${SPHINX_BUILD_DIR}\"") + get_subproject_title(subproject_title) + set_target_properties(${SPHINX_TARGET_NAME} PROPERTIES FOLDER "${subproject_title}/Docs") # When "clean" target is run, remove the Sphinx build directory set_property(DIRECTORY APPEND PROPERTY diff --git a/llvm/cmake/modules/CrossCompile.cmake b/llvm/cmake/modules/CrossCompile.cmake index 55bf3be756427..39b4abaa0d931 100644 --- a/llvm/cmake/modules/CrossCompile.cmake +++ b/llvm/cmake/modules/CrossCompile.cmake @@ -45,6 +45,8 @@ function(llvm_create_cross_target project_name target_name toolchain buildtype) add_custom_target(CREATE_${project_name}_${target_name} DEPENDS ${${project_name}_${target_name}_BUILD}) + get_subproject_title(subproject_title) + set_target_properties(CREATE_${project_name}_${target_name} PROPERTIES FOLDER "${subproject_title}/Native") # Escape semicolons in the targets list so that cmake doesn't expand # them to spaces. @@ -98,6 +100,8 @@ function(llvm_create_cross_target project_name target_name toolchain buildtype) add_custom_target(CONFIGURE_${project_name}_${target_name} DEPENDS ${${project_name}_${target_name}_BUILD}/CMakeCache.txt) + get_subproject_title(subproject_title) + set_target_properties(CONFIGURE_${project_name}_${target_name} PROPERTIES FOLDER "${subproject_title}/Native") endfunction() diff --git a/llvm/cmake/modules/LLVMDistributionSupport.cmake b/llvm/cmake/modules/LLVMDistributionSupport.cmake index 0b78f8f9137c5..011548419e0c3 100644 --- a/llvm/cmake/modules/LLVMDistributionSupport.cmake +++ b/llvm/cmake/modules/LLVMDistributionSupport.cmake @@ -210,6 +210,7 @@ function(install_distribution_exports project) COMPONENT ${target}) if(NOT LLVM_ENABLE_IDE) add_custom_target(${target}) + set_target_properties(${target} PROPERTIES FOLDER "LLVM/Distribution") add_llvm_install_targets(install-${target} COMPONENT ${target}) endif() endif() @@ -260,6 +261,13 @@ function(llvm_distribution_add_targets) add_custom_target(${distribution_target}) add_custom_target(install-${distribution_target}) add_custom_target(install-${distribution_target}-stripped) + set_target_properties( + ${distribution_target} + install-${distribution_target} + install-${distribution_target}-stripped + PROPERTIES + FOLDER "LLVM/Distribution" + ) foreach(target ${distribution_components}) # Note that some distribution components may not have an actual target, but only an install-FOO target. diff --git a/llvm/cmake/modules/LLVMExternalProjectUtils.cmake b/llvm/cmake/modules/LLVMExternalProjectUtils.cmake index 2672f90f579bd..edfee259470df 100644 --- a/llvm/cmake/modules/LLVMExternalProjectUtils.cmake +++ b/llvm/cmake/modules/LLVMExternalProjectUtils.cmake @@ -56,11 +56,13 @@ endfunction() # Use provided strip tool instead of the default one. # TARGET_TRIPLE triple # Optional target triple to pass to the compiler +# FOLDER +# For IDEs, the Folder to put the targets into. # ) function(llvm_ExternalProject_Add name source_dir) cmake_parse_arguments(ARG "USE_TOOLCHAIN;EXCLUDE_FROM_ALL;NO_INSTALL;ALWAYS_CLEAN" - "SOURCE_DIR" + "SOURCE_DIR;FOLDER" "CMAKE_ARGS;TOOLCHAIN_TOOLS;RUNTIME_LIBRARIES;DEPENDS;EXTRA_TARGETS;PASSTHROUGH_PREFIXES;STRIP_TOOL;TARGET_TRIPLE" ${ARGN}) canonicalize_tool_name(${name} nameCanon) @@ -150,6 +152,9 @@ function(llvm_ExternalProject_Add name source_dir) COMMENT "Clobbering ${name} build and stamp directories" USES_TERMINAL ) + if (ARG_FOLDER) + set_target_properties(${name}-clear PROPERTIES FOLDER "${ARG_FOLDER}") + endif () # Find all variables that start with a prefix and propagate them through get_cmake_property(variableNames VARIABLES) @@ -252,6 +257,9 @@ function(llvm_ExternalProject_Add name source_dir) add_custom_target(${name}-clobber DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${name}-clobber-stamp) + if (ARG_FOLDER) + set_target_properties(${name}-clobber PROPERTIES FOLDER "${ARG_FOLDER}") + endif () if(ARG_EXCLUDE_FROM_ALL) set(exclude EXCLUDE_FROM_ALL 1) @@ -360,6 +368,12 @@ function(llvm_ExternalProject_Add name source_dir) USES_TERMINAL_INSTALL 1 LIST_SEPARATOR | ) + if (ARG_FOLDER) + set_target_properties( + ${name} ${name}-clobber ${name}-build ${name}-configure + PROPERTIES FOLDER "${ARG_FOLDER}" + ) + endif () if(ARG_USE_TOOLCHAIN) set(force_deps DEPENDS ${TOOLCHAIN_BINS}) @@ -376,6 +390,9 @@ function(llvm_ExternalProject_Add name source_dir) USES_TERMINAL 1 ) ExternalProject_Add_StepTargets(${name} clean) + if (ARG_FOLDER) + set_target_properties(${name}-clean PROPERTIES FOLDER "${ARG_FOLDER}") + endif () if(ARG_USE_TOOLCHAIN) add_dependencies(${name}-clean ${name}-clobber) @@ -390,6 +407,9 @@ function(llvm_ExternalProject_Add name source_dir) add_llvm_install_targets(install-${name} DEPENDS ${name} COMPONENT ${name}) + if (ARG_FOLDER) + set_target_properties(install-${name} PROPERTIES FOLDER "${ARG_FOLDER}") + endif () endif() # Add top-level targets @@ -406,5 +426,8 @@ function(llvm_ExternalProject_Add name source_dir) WORKING_DIRECTORY ${BINARY_DIR} VERBATIM USES_TERMINAL) + if (ARG_FOLDER) + set_target_properties(${target} PROPERTIES FOLDER "${ARG_FOLDER}") + endif () endforeach() endfunction() diff --git a/llvm/cmake/modules/TableGen.cmake b/llvm/cmake/modules/TableGen.cmake index df91598c404f5..b6b3666cd0d4d 100644 --- a/llvm/cmake/modules/TableGen.cmake +++ b/llvm/cmake/modules/TableGen.cmake @@ -167,7 +167,8 @@ function(add_public_tablegen_target target) if(LLVM_COMMON_DEPENDS) add_dependencies(${target} ${LLVM_COMMON_DEPENDS}) endif() - set_target_properties(${target} PROPERTIES FOLDER "Tablegenning") + get_subproject_title(subproject_title) + set_target_properties(${target} PROPERTIES FOLDER "${subproject_title}/Tablegenning/Targets") set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} ${target} PARENT_SCOPE) endfunction() @@ -179,6 +180,8 @@ macro(add_tablegen target project) add_llvm_executable(${target} DISABLE_LLVM_LINK_LLVM_DYLIB ${ADD_TABLEGEN_UNPARSED_ARGUMENTS}) + get_subproject_title(subproject_title) + set_target_properties(${target} PROPERTIES FOLDER "${subproject_title}/Tablegenning") set(LLVM_LINK_COMPONENTS ${${target}_OLD_LLVM_LINK_COMPONENTS}) set(${project}_TABLEGEN_DEFAULT "${target}") @@ -217,6 +220,8 @@ macro(add_tablegen target project) set(${project}_TABLEGEN_EXE ${${project}_TABLEGEN_EXE} PARENT_SCOPE) add_custom_target(${target}-host DEPENDS ${${project}_TABLEGEN_EXE}) + get_subproject_title(subproject_title) + set_target_properties(${target}-host PROPERTIES FOLDER "${subproject_title}/Native") set(${project}_TABLEGEN_TARGET ${target}-host PARENT_SCOPE) # If we're using the host tablegen, and utils were not requested, we have no diff --git a/llvm/docs/CMakeLists.txt b/llvm/docs/CMakeLists.txt index 5e420a2696329..bc87eb727d322 100644 --- a/llvm/docs/CMakeLists.txt +++ b/llvm/docs/CMakeLists.txt @@ -87,6 +87,7 @@ if (LLVM_ENABLE_DOXYGEN) COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating llvm doxygen documentation." VERBATIM) + set_target_properties(doxygen-llvm PROPERTIES FOLDER "LLVM/Docs") if (LLVM_BUILD_DOCS) add_dependencies(doxygen doxygen-llvm) diff --git a/llvm/examples/Kaleidoscope/CMakeLists.txt b/llvm/examples/Kaleidoscope/CMakeLists.txt index 3822cdd9e1c49..6ad3b61566472 100644 --- a/llvm/examples/Kaleidoscope/CMakeLists.txt +++ b/llvm/examples/Kaleidoscope/CMakeLists.txt @@ -1,5 +1,5 @@ add_custom_target(Kaleidoscope) -set_target_properties(Kaleidoscope PROPERTIES FOLDER Examples) +set_target_properties(Kaleidoscope PROPERTIES FOLDER "LLVM/Examples") macro(add_kaleidoscope_chapter name) add_dependencies(Kaleidoscope ${name}) diff --git a/llvm/include/llvm/Support/CMakeLists.txt b/llvm/include/llvm/Support/CMakeLists.txt index 76c382bfc644f..e34c11b2d0867 100644 --- a/llvm/include/llvm/Support/CMakeLists.txt +++ b/llvm/include/llvm/Support/CMakeLists.txt @@ -48,4 +48,4 @@ set_source_files_properties("${version_inc}" HEADER_FILE_ONLY TRUE) add_custom_target(llvm_vcsrevision_h ALL DEPENDS "${generated_files}") -set_target_properties(llvm_vcsrevision_h PROPERTIES FOLDER "Misc") +set_target_properties(llvm_vcsrevision_h PROPERTIES FOLDER "LLVM/Resources") diff --git a/llvm/lib/Support/BLAKE3/CMakeLists.txt b/llvm/lib/Support/BLAKE3/CMakeLists.txt index cb4f840461f7c..51317b8048f76 100644 --- a/llvm/lib/Support/BLAKE3/CMakeLists.txt +++ b/llvm/lib/Support/BLAKE3/CMakeLists.txt @@ -79,4 +79,5 @@ else() endif() add_library(LLVMSupportBlake3 OBJECT EXCLUDE_FROM_ALL ${LLVM_BLAKE3_FILES}) +set_target_properties(LLVMSupportBlake3 PROPERTIES FOLDER "LLVM/Libraries") llvm_update_compile_flags(LLVMSupportBlake3) diff --git a/llvm/runtimes/CMakeLists.txt b/llvm/runtimes/CMakeLists.txt index 8159d7f8a0a10..c5d754ab2781f 100644 --- a/llvm/runtimes/CMakeLists.txt +++ b/llvm/runtimes/CMakeLists.txt @@ -93,6 +93,7 @@ function(builtin_default_target compiler_rt_path) SANITIZER USE_TOOLCHAIN TARGET_TRIPLE ${LLVM_TARGET_TRIPLE} + FOLDER "Compiler-RT" ${EXTRA_ARGS}) endfunction() @@ -128,6 +129,7 @@ function(builtin_register_target compiler_rt_path name) ${COMMON_CMAKE_ARGS} ${${name}_extra_args} USE_TOOLCHAIN + FOLDER "Compiler-RT" ${EXTRA_ARGS} ${ARG_EXTRA_ARGS}) endfunction() @@ -148,6 +150,10 @@ if(compiler_rt_path) add_custom_target(builtins) add_custom_target(install-builtins) add_custom_target(install-builtins-stripped) + set_target_properties( + builtins install-builtins install-builtins-stripped + PROPERTIES FOLDER "Compiler-RT" + ) endif() foreach(target ${LLVM_BUILTIN_TARGETS}) @@ -263,6 +269,7 @@ function(runtime_default_target) ${SUB_INSTALL_TARGETS} USE_TOOLCHAIN TARGET_TRIPLE ${LLVM_TARGET_TRIPLE} + FOLDER "Runtimes" ${EXTRA_ARGS}) endfunction() @@ -388,6 +395,7 @@ function(runtime_register_target name) EXTRA_TARGETS ${${name}_extra_targets} ${${name}_test_targets} USE_TOOLCHAIN + FOLDER "${name}" ${EXTRA_ARGS} ${ARG_EXTRA_ARGS}) add_dependencies(runtimes runtimes-${name}) @@ -401,14 +409,17 @@ function(runtime_register_target name) foreach(runtime_name ${runtime_names}) if(NOT TARGET ${runtime_name}) add_custom_target(${runtime_name}) + set_target_properties(${runtime_name} PROPERTIES FOLDER "${runtime_name}") endif() add_dependencies(${runtime_name} ${runtime_name}-${name}) if(NOT TARGET install-${runtime_name}) add_custom_target(install-${runtime_name}) + set_target_properties(install-${runtime_name} PROPERTIES FOLDER "${runtime_name}") endif() add_dependencies(install-${runtime_name} install-${runtime_name}-${name}) if(NOT TARGET install-${runtime_name}-stripped) add_custom_target(install-${runtime_name}-stripped) + set_target_properties(install-${runtime_name} PROPERTIES FOLDER "${runtime_name}") endif() add_dependencies(install-${runtime_name}-stripped install-${runtime_name}-${name}-stripped) endforeach() @@ -505,9 +516,17 @@ if(runtimes) add_custom_target(runtimes-configure) add_custom_target(install-runtimes) add_custom_target(install-runtimes-stripped) + set_target_properties( + runtimes runtimes-configure install-runtimes install-runtimes-stripped + PROPERTIES FOLDER "Runtimes" + ) if(LLVM_INCLUDE_TESTS) add_custom_target(check-runtimes) add_custom_target(runtimes-test-depends) + set_target_properties( + check-runtimes runtimes-test-depends + PROPERTIES FOLDER "Runtimes" + ) set(test_targets "") endif() if(LLVM_RUNTIME_DISTRIBUTION_COMPONENTS) @@ -515,6 +534,10 @@ if(runtimes) add_custom_target(${component}) add_custom_target(install-${component}) add_custom_target(install-${component}-stripped) + set_target_properties( + ${component} install-${component} install-${component}-stripped + PROPERTIES FOLDER "${component}" + ) endforeach() endif() endif() diff --git a/llvm/test/CMakeLists.txt b/llvm/test/CMakeLists.txt index 6127b76db06b7..fad9fb2f32fa7 100644 --- a/llvm/test/CMakeLists.txt +++ b/llvm/test/CMakeLists.txt @@ -229,7 +229,7 @@ if (LLVM_INCLUDE_SPIRV_TOOLS_TESTS) endif() add_custom_target(llvm-test-depends DEPENDS ${LLVM_TEST_DEPENDS}) -set_target_properties(llvm-test-depends PROPERTIES FOLDER "Tests") +set_target_properties(llvm-test-depends PROPERTIES FOLDER "LLVM/Tests") if(LLVM_BUILD_TOOLS) set(exclude_from_check_all "") @@ -242,7 +242,7 @@ add_lit_testsuite(check-llvm "Running the LLVM regression tests" ${exclude_from_check_all} DEPENDS ${LLVM_TEST_DEPENDS} ) -set_target_properties(check-llvm PROPERTIES FOLDER "Tests") +set_target_properties(check-llvm PROPERTIES FOLDER "LLVM/Tests") add_lit_testsuites(LLVM ${CMAKE_CURRENT_SOURCE_DIR} ${exclude_from_check_all} @@ -253,4 +253,4 @@ add_lit_testsuites(LLVM ${CMAKE_CURRENT_SOURCE_DIR} # Setup an alias for 'check-all'. add_custom_target(check) add_dependencies(check check-all) -set_target_properties(check PROPERTIES FOLDER "Tests") +set_target_properties(check PROPERTIES FOLDER "LLVM/Tests") diff --git a/llvm/tools/opt-viewer/CMakeLists.txt b/llvm/tools/opt-viewer/CMakeLists.txt index c0070f8cbfac8..4bcf6932ee773 100644 --- a/llvm/tools/opt-viewer/CMakeLists.txt +++ b/llvm/tools/opt-viewer/CMakeLists.txt @@ -13,6 +13,7 @@ foreach (file ${files}) endforeach (file) add_custom_target(opt-viewer DEPENDS ${files}) +set_target_properties(opt-viewer PROPERTIES FOLDER "LLVM/Tools") if(NOT LLVM_ENABLE_IDE) add_llvm_install_targets("install-opt-viewer" DEPENDS opt-viewer diff --git a/llvm/unittests/Analysis/InlineAdvisorPlugin/CMakeLists.txt b/llvm/unittests/Analysis/InlineAdvisorPlugin/CMakeLists.txt index a0df549e8ea98..22cd0cb1d9a03 100644 --- a/llvm/unittests/Analysis/InlineAdvisorPlugin/CMakeLists.txt +++ b/llvm/unittests/Analysis/InlineAdvisorPlugin/CMakeLists.txt @@ -12,11 +12,10 @@ if (NOT WIN32 AND NOT CYGWIN) BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/../ LIBRARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/../ ) - set_target_properties(InlineAdvisorPlugin PROPERTIES FOLDER "Tests") + set_target_properties(InlineAdvisorPlugin PROPERTIES FOLDER "LLVM/Tests") # The plugin depends on some of the output files of intrinsics_gen, so make sure # it is built before the plugin. add_dependencies(InlineAdvisorPlugin intrinsics_gen) add_dependencies(AnalysisTests InlineAdvisorPlugin) - set_property(TARGET InlineAdvisorPlugin PROPERTY FOLDER "Tests/UnitTests/AnalysisTests") endif() diff --git a/llvm/unittests/Analysis/InlineOrderPlugin/CMakeLists.txt b/llvm/unittests/Analysis/InlineOrderPlugin/CMakeLists.txt index e5e5ac4a6fa9f..86d4f64fb42ac 100644 --- a/llvm/unittests/Analysis/InlineOrderPlugin/CMakeLists.txt +++ b/llvm/unittests/Analysis/InlineOrderPlugin/CMakeLists.txt @@ -18,5 +18,5 @@ if (NOT WIN32 AND NOT CYGWIN) # it is built before the plugin. add_dependencies(InlineOrderPlugin intrinsics_gen) add_dependencies(AnalysisTests InlineOrderPlugin) - set_property(TARGET InlineOrderPlugin PROPERTY FOLDER "Tests/UnitTests/AnalysisTests") + set_property(TARGET InlineOrderPlugin PROPERTY FOLDER "Tests/Unittests/AnalysisTests") endif() diff --git a/llvm/unittests/CMakeLists.txt b/llvm/unittests/CMakeLists.txt index 46f30ff398e10..b2f10b2185880 100644 --- a/llvm/unittests/CMakeLists.txt +++ b/llvm/unittests/CMakeLists.txt @@ -1,5 +1,5 @@ add_custom_target(UnitTests) -set_target_properties(UnitTests PROPERTIES FOLDER "Tests/UnitTests") +set_target_properties(UnitTests PROPERTIES FOLDER "LLVM/Tests") function(add_llvm_unittest test_dirname) add_unittest(UnitTests ${test_dirname} ${ARGN}) diff --git a/llvm/unittests/DebugInfo/BTF/CMakeLists.txt b/llvm/unittests/DebugInfo/BTF/CMakeLists.txt index b425e46b9f0cb..6f7f684c58bed 100644 --- a/llvm/unittests/DebugInfo/BTF/CMakeLists.txt +++ b/llvm/unittests/DebugInfo/BTF/CMakeLists.txt @@ -9,5 +9,3 @@ add_llvm_unittest(DebugInfoBTFTests ) target_link_libraries(DebugInfoBTFTests PRIVATE LLVMTestingSupport) - -set_property(TARGET DebugInfoBTFTests PROPERTY FOLDER "Tests/UnitTests/DebugInfoTests") diff --git a/llvm/unittests/DebugInfo/CodeView/CMakeLists.txt b/llvm/unittests/DebugInfo/CodeView/CMakeLists.txt index 9a5eca14a8798..5044b9bde2905 100644 --- a/llvm/unittests/DebugInfo/CodeView/CMakeLists.txt +++ b/llvm/unittests/DebugInfo/CodeView/CMakeLists.txt @@ -10,5 +10,3 @@ add_llvm_unittest(DebugInfoCodeViewTests ) target_link_libraries(DebugInfoCodeViewTests PRIVATE LLVMTestingSupport) - -set_property(TARGET DebugInfoCodeViewTests PROPERTY FOLDER "Tests/UnitTests/DebugInfoTests") diff --git a/llvm/unittests/DebugInfo/DWARF/CMakeLists.txt b/llvm/unittests/DebugInfo/DWARF/CMakeLists.txt index 1ba3786387594..0c5b3f28ca3d5 100644 --- a/llvm/unittests/DebugInfo/DWARF/CMakeLists.txt +++ b/llvm/unittests/DebugInfo/DWARF/CMakeLists.txt @@ -31,5 +31,3 @@ add_llvm_unittest(DebugInfoDWARFTests ) target_link_libraries(DebugInfoDWARFTests PRIVATE LLVMTestingSupport) - -set_property(TARGET DebugInfoDWARFTests PROPERTY FOLDER "Tests/UnitTests/DebugInfoTests") diff --git a/llvm/unittests/DebugInfo/GSYM/CMakeLists.txt b/llvm/unittests/DebugInfo/GSYM/CMakeLists.txt index 7cd5af561c6df..029767471c864 100644 --- a/llvm/unittests/DebugInfo/GSYM/CMakeLists.txt +++ b/llvm/unittests/DebugInfo/GSYM/CMakeLists.txt @@ -11,5 +11,3 @@ add_llvm_unittest(DebugInfoGSYMTests ) target_link_libraries(DebugInfoGSYMTests PRIVATE LLVMTestingSupport) - -set_property(TARGET DebugInfoGSYMTests PROPERTY FOLDER "Tests/UnitTests/DebugInfoTests") diff --git a/llvm/unittests/DebugInfo/MSF/CMakeLists.txt b/llvm/unittests/DebugInfo/MSF/CMakeLists.txt index 5e06ef683867b..0e48ab8f2f6b2 100644 --- a/llvm/unittests/DebugInfo/MSF/CMakeLists.txt +++ b/llvm/unittests/DebugInfo/MSF/CMakeLists.txt @@ -9,5 +9,3 @@ add_llvm_unittest(DebugInfoMSFTests ) target_link_libraries(DebugInfoMSFTests PRIVATE LLVMTestingSupport) - -set_property(TARGET DebugInfoMSFTests PROPERTY FOLDER "Tests/UnitTests/DebugInfoTests") diff --git a/llvm/unittests/DebugInfo/PDB/CMakeLists.txt b/llvm/unittests/DebugInfo/PDB/CMakeLists.txt index 2907b556e3cda..c8c2659277a63 100644 --- a/llvm/unittests/DebugInfo/PDB/CMakeLists.txt +++ b/llvm/unittests/DebugInfo/PDB/CMakeLists.txt @@ -13,5 +13,3 @@ add_llvm_unittest_with_input_files(DebugInfoPDBTests ) target_link_libraries(DebugInfoPDBTests PRIVATE LLVMTestingSupport) - -set_property(TARGET DebugInfoPDBTests PROPERTY FOLDER "Tests/UnitTests/DebugInfoTests") diff --git a/llvm/unittests/ExecutionEngine/CMakeLists.txt b/llvm/unittests/ExecutionEngine/CMakeLists.txt index ab6b9e7070f9e..1bf210556b661 100644 --- a/llvm/unittests/ExecutionEngine/CMakeLists.txt +++ b/llvm/unittests/ExecutionEngine/CMakeLists.txt @@ -21,5 +21,3 @@ list(FIND LLVM_TARGETS_WITH_JIT "${LLVM_NATIVE_ARCH}" jit_idx) if (NOT build_idx LESS 0 AND NOT jit_idx LESS 0) add_subdirectory(MCJIT) endif() - -set_property(TARGET ExecutionEngineTests PROPERTY FOLDER "Tests/UnitTests/ExecutionTests") diff --git a/llvm/unittests/ExecutionEngine/JITLink/CMakeLists.txt b/llvm/unittests/ExecutionEngine/JITLink/CMakeLists.txt index d4886754f0a9c..82d277309307c 100644 --- a/llvm/unittests/ExecutionEngine/JITLink/CMakeLists.txt +++ b/llvm/unittests/ExecutionEngine/JITLink/CMakeLists.txt @@ -18,5 +18,3 @@ add_llvm_unittest(JITLinkTests ) target_link_libraries(JITLinkTests PRIVATE LLVMTestingSupport) - -set_property(TARGET JITLinkTests PROPERTY FOLDER "Tests/UnitTests/ExecutionTests") diff --git a/llvm/unittests/ExecutionEngine/MCJIT/CMakeLists.txt b/llvm/unittests/ExecutionEngine/MCJIT/CMakeLists.txt index 110f097e088a9..3784ca290cb08 100644 --- a/llvm/unittests/ExecutionEngine/MCJIT/CMakeLists.txt +++ b/llvm/unittests/ExecutionEngine/MCJIT/CMakeLists.txt @@ -32,5 +32,3 @@ add_llvm_unittest(MCJITTests if(MINGW OR CYGWIN) set_property(TARGET MCJITTests PROPERTY LINK_FLAGS -Wl,--export-all-symbols) endif() - -set_property(TARGET MCJITTests PROPERTY FOLDER "Tests/UnitTests/ExecutionTests") diff --git a/llvm/unittests/ExecutionEngine/Orc/CMakeLists.txt b/llvm/unittests/ExecutionEngine/Orc/CMakeLists.txt index 8a6a26bba63c2..af431658c9b7d 100644 --- a/llvm/unittests/ExecutionEngine/Orc/CMakeLists.txt +++ b/llvm/unittests/ExecutionEngine/Orc/CMakeLists.txt @@ -48,6 +48,4 @@ target_link_libraries(OrcJITTests PRIVATE LLVMTestingSupport ${ORC_JIT_TEST_LIBS}) -set_property(TARGET OrcJITTests PROPERTY FOLDER "Tests/UnitTests/ExecutionTests") - export_executable_symbols(OrcJITTests) diff --git a/llvm/unittests/Support/CommandLineInit/CMakeLists.txt b/llvm/unittests/Support/CommandLineInit/CMakeLists.txt index 1889c8fba9a7a..adcebb5cdbeb5 100644 --- a/llvm/unittests/Support/CommandLineInit/CMakeLists.txt +++ b/llvm/unittests/Support/CommandLineInit/CMakeLists.txt @@ -33,7 +33,3 @@ add_dependencies(${test_suite} ${test_name}) set(outdir ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}) set_output_directory(${test_name} BINARY_DIR ${outdir} LIBRARY_DIR ${outdir}) -get_target_property(test_suite_folder ${test_suite} FOLDER) -if (test_suite_folder) - set_property(TARGET ${test_name} PROPERTY FOLDER "${test_suite_folder}") -endif () diff --git a/llvm/unittests/Support/DynamicLibrary/CMakeLists.txt b/llvm/unittests/Support/DynamicLibrary/CMakeLists.txt index 9e5d3b3dfb159..05610afae6061 100644 --- a/llvm/unittests/Support/DynamicLibrary/CMakeLists.txt +++ b/llvm/unittests/Support/DynamicLibrary/CMakeLists.txt @@ -6,7 +6,7 @@ set(LLVM_LINK_COMPONENTS Support) add_library(DynamicLibraryLib STATIC ExportedFuncs.cpp ) -set_target_properties(DynamicLibraryLib PROPERTIES FOLDER "Tests") +set_target_properties(DynamicLibraryLib PROPERTIES FOLDER "LLVM/Tests") # extract_symbols.py relies on all its library arguments being in the same # directory, so we must set the output directory in the same way as if @@ -25,7 +25,7 @@ function(dynlib_add_module NAME) add_library(${NAME} MODULE PipSqueak.cpp ) - set_target_properties(${NAME} PROPERTIES FOLDER "Tests") + set_target_properties(${NAME} PROPERTIES FOLDER "LLVM/Tests") set_output_directory(${NAME} BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} diff --git a/llvm/unittests/Target/AArch64/CMakeLists.txt b/llvm/unittests/Target/AArch64/CMakeLists.txt index 64ab991ac479a..f53668373efee 100644 --- a/llvm/unittests/Target/AArch64/CMakeLists.txt +++ b/llvm/unittests/Target/AArch64/CMakeLists.txt @@ -31,5 +31,3 @@ add_llvm_target_unittest(AArch64Tests AArch64SVESchedPseudoTest.cpp Immediates.cpp ) - -set_property(TARGET AArch64Tests PROPERTY FOLDER "Tests/UnitTests/TargetTests") diff --git a/llvm/unittests/Target/AMDGPU/CMakeLists.txt b/llvm/unittests/Target/AMDGPU/CMakeLists.txt index 2d7a47943df69..ae5052925712a 100644 --- a/llvm/unittests/Target/AMDGPU/CMakeLists.txt +++ b/llvm/unittests/Target/AMDGPU/CMakeLists.txt @@ -21,5 +21,3 @@ add_llvm_target_unittest(AMDGPUTests DwarfRegMappings.cpp ExecMayBeModifiedBeforeAnyUse.cpp ) - -set_property(TARGET AMDGPUTests PROPERTY FOLDER "Tests/UnitTests/TargetTests") diff --git a/llvm/unittests/Target/ARM/CMakeLists.txt b/llvm/unittests/Target/ARM/CMakeLists.txt index 3da6cd95caedc..5da249708abf9 100644 --- a/llvm/unittests/Target/ARM/CMakeLists.txt +++ b/llvm/unittests/Target/ARM/CMakeLists.txt @@ -23,5 +23,3 @@ add_llvm_target_unittest(ARMTests MachineInstrTest.cpp InstSizes.cpp ) - -set_property(TARGET ARMTests PROPERTY FOLDER "Tests/UnitTests/TargetTests") diff --git a/llvm/unittests/Target/CMakeLists.txt b/llvm/unittests/Target/CMakeLists.txt index b10236a2948f8..589314fad889d 100644 --- a/llvm/unittests/Target/CMakeLists.txt +++ b/llvm/unittests/Target/CMakeLists.txt @@ -9,6 +9,3 @@ set(LLVM_LINK_COMPONENTS Core Target AllTargetsCodeGens AllTargetsDescs AllTarge add_llvm_unittest(TargetMachineCTests TargetMachineOptionsTest.cpp ) - -set_property(TARGET TargetMachineCTests - PROPERTY FOLDER "Tests/UnitTests/TargetTests") diff --git a/llvm/unittests/Target/LoongArch/CMakeLists.txt b/llvm/unittests/Target/LoongArch/CMakeLists.txt index e6f8ec073721f..6e7e49b4cb4e0 100644 --- a/llvm/unittests/Target/LoongArch/CMakeLists.txt +++ b/llvm/unittests/Target/LoongArch/CMakeLists.txt @@ -22,5 +22,3 @@ add_llvm_target_unittest(LoongArchTests InstSizes.cpp MCInstrAnalysisTest.cpp ) - -set_property(TARGET LoongArchTests PROPERTY FOLDER "Tests/UnitTests/TargetTests") diff --git a/llvm/unittests/Target/PowerPC/CMakeLists.txt b/llvm/unittests/Target/PowerPC/CMakeLists.txt index 893e7587b372d..a45052950704e 100644 --- a/llvm/unittests/Target/PowerPC/CMakeLists.txt +++ b/llvm/unittests/Target/PowerPC/CMakeLists.txt @@ -16,5 +16,3 @@ set(LLVM_LINK_COMPONENTS add_llvm_unittest(PowerPCTests AIXRelocModelTest.cpp ) - -set_property(TARGET PowerPCTests PROPERTY FOLDER "Tests/UnitTests/TargetTests") diff --git a/llvm/unittests/Target/RISCV/CMakeLists.txt b/llvm/unittests/Target/RISCV/CMakeLists.txt index 0a64bf273e314..10d6412f9b358 100644 --- a/llvm/unittests/Target/RISCV/CMakeLists.txt +++ b/llvm/unittests/Target/RISCV/CMakeLists.txt @@ -19,5 +19,3 @@ add_llvm_target_unittest(RISCVTests MCInstrAnalysisTest.cpp RISCVInstrInfoTest.cpp ) - -set_property(TARGET RISCVTests PROPERTY FOLDER "Tests/UnitTests/TargetTests") diff --git a/llvm/unittests/Target/WebAssembly/CMakeLists.txt b/llvm/unittests/Target/WebAssembly/CMakeLists.txt index 6175e6bfe6e1c..b1e01169e7a06 100644 --- a/llvm/unittests/Target/WebAssembly/CMakeLists.txt +++ b/llvm/unittests/Target/WebAssembly/CMakeLists.txt @@ -18,5 +18,3 @@ set(LLVM_LINK_COMPONENTS add_llvm_target_unittest(WebAssemblyTests WebAssemblyExceptionInfoTest.cpp ) - -set_property(TARGET WebAssemblyTests PROPERTY FOLDER "Tests/UnitTests/TargetTests") diff --git a/llvm/unittests/Target/X86/CMakeLists.txt b/llvm/unittests/Target/X86/CMakeLists.txt index 2b371966d1bcd..b011681aa3b95 100644 --- a/llvm/unittests/Target/X86/CMakeLists.txt +++ b/llvm/unittests/Target/X86/CMakeLists.txt @@ -25,5 +25,3 @@ add_llvm_unittest(X86Tests MachineSizeOptsTest.cpp TernlogTest.cpp ) - -set_property(TARGET X86Tests PROPERTY FOLDER "Tests/UnitTests/TargetTests") diff --git a/llvm/unittests/Transforms/Coroutines/CMakeLists.txt b/llvm/unittests/Transforms/Coroutines/CMakeLists.txt index 0913e82a34432..8a457753ce3e2 100644 --- a/llvm/unittests/Transforms/Coroutines/CMakeLists.txt +++ b/llvm/unittests/Transforms/Coroutines/CMakeLists.txt @@ -14,5 +14,3 @@ add_llvm_unittest(CoroTests ) target_link_libraries(CoroTests PRIVATE LLVMTestingSupport) - -set_property(TARGET CoroTests PROPERTY FOLDER "Tests/UnitTests/TransformTests") diff --git a/llvm/unittests/Transforms/IPO/CMakeLists.txt b/llvm/unittests/Transforms/IPO/CMakeLists.txt index 4e4372179b46c..ac632450d5730 100644 --- a/llvm/unittests/Transforms/IPO/CMakeLists.txt +++ b/llvm/unittests/Transforms/IPO/CMakeLists.txt @@ -14,5 +14,3 @@ add_llvm_unittest(IPOTests AttributorTest.cpp FunctionSpecializationTest.cpp ) - -set_property(TARGET IPOTests PROPERTY FOLDER "Tests/UnitTests/TransformsTests") diff --git a/llvm/unittests/Transforms/Scalar/CMakeLists.txt b/llvm/unittests/Transforms/Scalar/CMakeLists.txt index 5e37ecf4fe4a5..eaa2c4eb27a1c 100644 --- a/llvm/unittests/Transforms/Scalar/CMakeLists.txt +++ b/llvm/unittests/Transforms/Scalar/CMakeLists.txt @@ -19,5 +19,3 @@ target_link_libraries(ScalarTests PRIVATE LLVMTestingSupport) if (CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.0) set_source_files_properties(LoopPassManagerTest.cpp PROPERTIES COMPILE_FLAGS -Wno-unused-function) endif() - -set_property(TARGET ScalarTests PROPERTY FOLDER "Tests/UnitTests/TransformsTests") diff --git a/llvm/unittests/Transforms/Utils/CMakeLists.txt b/llvm/unittests/Transforms/Utils/CMakeLists.txt index 2974811d6c412..35055baa05ee9 100644 --- a/llvm/unittests/Transforms/Utils/CMakeLists.txt +++ b/llvm/unittests/Transforms/Utils/CMakeLists.txt @@ -32,5 +32,3 @@ add_llvm_unittest(UtilsTests ValueMapperTest.cpp ProfDataUtilTest.cpp ) - -set_property(TARGET UtilsTests PROPERTY FOLDER "Tests/UnitTests/TransformsTests") diff --git a/llvm/unittests/Transforms/Vectorize/CMakeLists.txt b/llvm/unittests/Transforms/Vectorize/CMakeLists.txt index 4f8dd577d0aa7..1354558a94f0d 100644 --- a/llvm/unittests/Transforms/Vectorize/CMakeLists.txt +++ b/llvm/unittests/Transforms/Vectorize/CMakeLists.txt @@ -13,5 +13,3 @@ add_llvm_unittest(VectorizeTests VPlanSlpTest.cpp VPlanVerifierTest.cpp ) - -set_property(TARGET VectorizeTests PROPERTY FOLDER "Tests/UnitTests/TransformsTests") diff --git a/llvm/unittests/tools/llvm-cfi-verify/CMakeLists.txt b/llvm/unittests/tools/llvm-cfi-verify/CMakeLists.txt index 9a4e8663c8069..7fc5dac85bb74 100644 --- a/llvm/unittests/tools/llvm-cfi-verify/CMakeLists.txt +++ b/llvm/unittests/tools/llvm-cfi-verify/CMakeLists.txt @@ -16,5 +16,3 @@ add_llvm_unittest(CFIVerifyTests GraphBuilder.cpp ) target_link_libraries(CFIVerifyTests PRIVATE LLVMCFIVerify) - -set_property(TARGET CFIVerifyTests PROPERTY FOLDER "Tests/UnitTests/ToolTests") diff --git a/llvm/unittests/tools/llvm-exegesis/CMakeLists.txt b/llvm/unittests/tools/llvm-exegesis/CMakeLists.txt index 8b2f6334dda86..3ee3a0dc6b5d0 100644 --- a/llvm/unittests/tools/llvm-exegesis/CMakeLists.txt +++ b/llvm/unittests/tools/llvm-exegesis/CMakeLists.txt @@ -62,5 +62,3 @@ add_llvm_target_unittest(LLVMExegesisTests ${exegesis_sources} ) target_link_libraries(LLVMExegesisTests PRIVATE ${exegesis_link_libraries}) - -set_property(TARGET LLVMExegesisTests PROPERTY FOLDER "Tests/UnitTests/ToolTests") diff --git a/llvm/unittests/tools/llvm-mca/CMakeLists.txt b/llvm/unittests/tools/llvm-mca/CMakeLists.txt index b209d7931190d..9c69509b4b54d 100644 --- a/llvm/unittests/tools/llvm-mca/CMakeLists.txt +++ b/llvm/unittests/tools/llvm-mca/CMakeLists.txt @@ -48,5 +48,3 @@ include_directories(${mca_includes}) add_llvm_target_unittest(LLVMMCATests ${mca_sources} ) - -set_property(TARGET LLVMMCATests PROPERTY FOLDER "Tests/UnitTests/ToolTests") diff --git a/llvm/unittests/tools/llvm-profdata/CMakeLists.txt b/llvm/unittests/tools/llvm-profdata/CMakeLists.txt index ad91ce36bcb5b..71de2326ee82c 100644 --- a/llvm/unittests/tools/llvm-profdata/CMakeLists.txt +++ b/llvm/unittests/tools/llvm-profdata/CMakeLists.txt @@ -9,5 +9,3 @@ add_llvm_unittest(LLVMProfdataTests ) target_link_libraries(LLVMProfdataTests PRIVATE LLVMTestingSupport) - -set_property(TARGET LLVMProfdataTests PROPERTY FOLDER "Tests/UnitTests/ToolTests") diff --git a/llvm/unittests/tools/llvm-profgen/CMakeLists.txt b/llvm/unittests/tools/llvm-profgen/CMakeLists.txt index a733843ef5193..5a658cf708467 100644 --- a/llvm/unittests/tools/llvm-profgen/CMakeLists.txt +++ b/llvm/unittests/tools/llvm-profgen/CMakeLists.txt @@ -9,5 +9,3 @@ add_llvm_unittest(LLVMProfgenTests target_link_libraries(LLVMProfgenTests PRIVATE LLVMTestingSupport) add_dependencies(LLVMProfgenTests intrinsics_gen) - -set_property(TARGET LLVMProfgenTests PROPERTY FOLDER "Tests/UnitTests/ToolTests") diff --git a/llvm/utils/LLVMVisualizers/CMakeLists.txt b/llvm/utils/LLVMVisualizers/CMakeLists.txt index 9fdc8906e55ae..db0a95c7d2b75 100644 --- a/llvm/utils/LLVMVisualizers/CMakeLists.txt +++ b/llvm/utils/LLVMVisualizers/CMakeLists.txt @@ -3,5 +3,5 @@ if (LLVM_ADD_NATIVE_VISUALIZERS_TO_SOLUTION) set(LLVM_VISUALIZERS llvm.natvis) add_custom_target(LLVMVisualizers SOURCES ${LLVM_VISUALIZERS}) - set_target_properties(LLVMVisualizers PROPERTIES FOLDER "Utils") + set_target_properties(LLVMVisualizers PROPERTIES FOLDER "LLVM/Utils") endif() diff --git a/llvm/utils/TableGen/Basic/CMakeLists.txt b/llvm/utils/TableGen/Basic/CMakeLists.txt index 5a899e3b7c803..09d79a01cae0a 100644 --- a/llvm/utils/TableGen/Basic/CMakeLists.txt +++ b/llvm/utils/TableGen/Basic/CMakeLists.txt @@ -12,7 +12,6 @@ add_llvm_library(LLVMTableGenBasic OBJECT EXCLUDE_FROM_ALL CodeGenIntrinsics.cpp SDNodeProperties.cpp ) -set_target_properties(LLVMTableGenBasic PROPERTIES FOLDER "Tablegenning") # Users may include its headers as "Basic/*.h" target_include_directories(LLVMTableGenBasic diff --git a/llvm/utils/TableGen/CMakeLists.txt b/llvm/utils/TableGen/CMakeLists.txt index 577aeded4be72..3dea626ab2ef8 100644 --- a/llvm/utils/TableGen/CMakeLists.txt +++ b/llvm/utils/TableGen/CMakeLists.txt @@ -22,7 +22,6 @@ add_tablegen(llvm-min-tblgen LLVM_HEADERS PARTIAL_SOURCES_INTENDED ) -set_target_properties(llvm-min-tblgen PROPERTIES FOLDER "Tablegenning") set(LLVM_LINK_COMPONENTS CodeGenTypes @@ -81,4 +80,3 @@ add_tablegen(llvm-tblgen LLVM DEPENDS intrinsics_gen # via llvm-min-tablegen ) -set_target_properties(llvm-tblgen PROPERTIES FOLDER "Tablegenning") diff --git a/llvm/utils/TableGen/Common/CMakeLists.txt b/llvm/utils/TableGen/Common/CMakeLists.txt index c31ed5a1de690..fb50785a038f3 100644 --- a/llvm/utils/TableGen/Common/CMakeLists.txt +++ b/llvm/utils/TableGen/Common/CMakeLists.txt @@ -42,7 +42,6 @@ add_llvm_library(LLVMTableGenCommon STATIC OBJECT EXCLUDE_FROM_ALL DEPENDS vt_gen ) -set_target_properties(LLVMTableGenCommon PROPERTIES FOLDER "Tablegenning") # Users may include its headers as "Common/*.h" target_include_directories(LLVMTableGenCommon diff --git a/llvm/utils/lit/CMakeLists.txt b/llvm/utils/lit/CMakeLists.txt index 3dc2dc0d8efcd..d22a778e2e531 100644 --- a/llvm/utils/lit/CMakeLists.txt +++ b/llvm/utils/lit/CMakeLists.txt @@ -26,5 +26,5 @@ add_lit_testsuite(check-lit "Running lit's tests" ) # For IDEs -set_target_properties(check-lit PROPERTIES FOLDER "Tests") -set_target_properties(prepare-check-lit PROPERTIES FOLDER "Tests") +set_target_properties(check-lit PROPERTIES FOLDER "LLVM/Tests") +set_target_properties(prepare-check-lit PROPERTIES FOLDER "LLVM/Tests") diff --git a/llvm/utils/llvm-locstats/CMakeLists.txt b/llvm/utils/llvm-locstats/CMakeLists.txt index 1dbb9da92e238..c0e0d43a7bd78 100644 --- a/llvm/utils/llvm-locstats/CMakeLists.txt +++ b/llvm/utils/llvm-locstats/CMakeLists.txt @@ -12,5 +12,5 @@ if (LLVM_INCLUDE_UTILS AND LLVM_INCLUDE_TOOLS) if (NOT LLVM_BUILD_TOOLS) set_target_properties(llvm-locstats PROPERTIES EXCLUDE_FROM_ALL ON) endif() - set_target_properties(llvm-locstats PROPERTIES FOLDER "Tools") + set_target_properties(llvm-locstats PROPERTIES FOLDER "LLVM/Tools") endif() diff --git a/llvm/utils/mlgo-utils/CMakeLists.txt b/llvm/utils/mlgo-utils/CMakeLists.txt index 3129331d58c75..dc78123ae4a85 100644 --- a/llvm/utils/mlgo-utils/CMakeLists.txt +++ b/llvm/utils/mlgo-utils/CMakeLists.txt @@ -8,4 +8,4 @@ add_lit_testsuite(check-mlgo-utils "Running mlgo-utils tests" DEPENDS "FileCheck" "not" "count" "split-file" "yaml2obj" "llvm-objcopy" ) -set_target_properties(check-mlgo-utils PROPERTIES FOLDER "Tests") +set_target_properties(check-mlgo-utils PROPERTIES FOLDER "LLVM/Tests") diff --git a/mlir/CMakeLists.txt b/mlir/CMakeLists.txt index 5c4301af040b4..0ff6658f831f5 100644 --- a/mlir/CMakeLists.txt +++ b/mlir/CMakeLists.txt @@ -1,5 +1,6 @@ # MLIR project. cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "MLIR") if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) @@ -96,12 +97,13 @@ endif() # tablegen'd targets. # mlir-generic-headers are dialect-independent. add_custom_target(mlir-generic-headers) -set_target_properties(mlir-generic-headers PROPERTIES FOLDER "Misc") +set_target_properties(mlir-generic-headers PROPERTIES FOLDER "MLIR/Resources") # mlir-headers may be dialect-dependent. add_custom_target(mlir-headers) -set_target_properties(mlir-headers PROPERTIES FOLDER "Misc") +set_target_properties(mlir-headers PROPERTIES FOLDER "MLIR/Resources") add_dependencies(mlir-headers mlir-generic-headers) add_custom_target(mlir-doc) +set_target_properties(mlir-doc PROPERTIES FOLDER "MLIR/Docs") # Only enable execution engine if the native target is available. if(${LLVM_NATIVE_ARCH} IN_LIST LLVM_TARGETS_TO_BUILD) @@ -198,6 +200,7 @@ add_subdirectory(lib/CAPI) if (MLIR_INCLUDE_TESTS) add_definitions(-DMLIR_INCLUDE_TESTS) add_custom_target(MLIRUnitTests) + set_target_properties(MLIRUnitTests PROPERTIES FOLDER "MLIR/Tests") if (EXISTS ${LLVM_THIRD_PARTY_DIR}/unittest/googletest/include/gtest/gtest.h) add_subdirectory(unittests) else() @@ -258,7 +261,7 @@ endif() # Custom target to install all mlir libraries add_custom_target(mlir-libraries) -set_target_properties(mlir-libraries PROPERTIES FOLDER "Misc") +set_target_properties(mlir-libraries PROPERTIES FOLDER "MLIR/Install") if (NOT LLVM_ENABLE_IDE) add_llvm_install_targets(install-mlir-libraries diff --git a/mlir/cmake/modules/AddMLIR.cmake b/mlir/cmake/modules/AddMLIR.cmake index 1d2ed748bc2f1..5a9a5b799763a 100644 --- a/mlir/cmake/modules/AddMLIR.cmake +++ b/mlir/cmake/modules/AddMLIR.cmake @@ -173,6 +173,7 @@ function(add_mlir_doc doc_filename output_file output_directory command) DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${output_file}.md) add_custom_target(${output_file}DocGen DEPENDS ${GEN_DOC_FILE}) add_dependencies(mlir-doc ${output_file}DocGen) + set_target_properties(${output_file}DocGen PROPERTIES FOLDER "MLIR/Docs") endfunction() # Sets ${srcs} to contain the list of additional headers for the target. Extra @@ -252,7 +253,7 @@ function(add_mlir_example_library name) list(APPEND ARG_DEPENDS mlir-generic-headers) llvm_add_library(${name} ${LIBTYPE} ${ARG_UNPARSED_ARGUMENTS} ${srcs} DEPENDS ${ARG_DEPENDS} LINK_COMPONENTS ${ARG_LINK_COMPONENTS} LINK_LIBS ${ARG_LINK_LIBS}) - set_target_properties(${name} PROPERTIES FOLDER "Examples") + set_target_properties(${name} PROPERTIES FOLDER "MLIR/Examples") if (LLVM_BUILD_EXAMPLES AND NOT ${ARG_DISABLE_INSTALL}) add_mlir_library_install(${name}) else() @@ -329,7 +330,7 @@ function(add_mlir_library name) # Add empty "phony" target add_custom_target(${name}) endif() - set_target_properties(${name} PROPERTIES FOLDER "MLIR libraries") + set_target_properties(${name} PROPERTIES FOLDER "MLIR/Libraries") # Setup aggregate. if(ARG_ENABLE_AGGREGATION) diff --git a/mlir/docs/CMakeLists.txt b/mlir/docs/CMakeLists.txt index 36cd3f9983881..43192569847cf 100644 --- a/mlir/docs/CMakeLists.txt +++ b/mlir/docs/CMakeLists.txt @@ -78,6 +78,7 @@ if (LLVM_ENABLE_DOXYGEN) COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating mlir doxygen documentation." VERBATIM) + set_target_properties(doxygen-mlir PROPERTIES FOLDER "MLIR/Docs") if (LLVM_BUILD_DOCS) add_dependencies(doxygen doxygen-mlir) diff --git a/mlir/examples/toy/CMakeLists.txt b/mlir/examples/toy/CMakeLists.txt index 56002b1ad2e27..403236a552028 100644 --- a/mlir/examples/toy/CMakeLists.txt +++ b/mlir/examples/toy/CMakeLists.txt @@ -1,5 +1,5 @@ add_custom_target(Toy) -set_target_properties(Toy PROPERTIES FOLDER Examples) +set_target_properties(Toy PROPERTIES FOLDER "MLIR/Examples") macro(add_toy_chapter name) add_dependencies(Toy ${name}) diff --git a/mlir/examples/transform/CMakeLists.txt b/mlir/examples/transform/CMakeLists.txt index b688aa7461d6f..2b4208e4c0f72 100644 --- a/mlir/examples/transform/CMakeLists.txt +++ b/mlir/examples/transform/CMakeLists.txt @@ -1,4 +1,5 @@ add_custom_target(TransformExample) +set_target_properties(TransformExample PROPERTIES FOLDER "MLIR/Examples") add_subdirectory(Ch2) add_subdirectory(Ch3) diff --git a/mlir/include/mlir/Dialect/Linalg/IR/CMakeLists.txt b/mlir/include/mlir/Dialect/Linalg/IR/CMakeLists.txt index f5d48b2ebcefe..d10273f749a5a 100644 --- a/mlir/include/mlir/Dialect/Linalg/IR/CMakeLists.txt +++ b/mlir/include/mlir/Dialect/Linalg/IR/CMakeLists.txt @@ -23,6 +23,7 @@ function(add_linalg_ods_yaml_gen yaml_ast_file output_file) ${MLIR_LINALG_ODS_YAML_GEN_EXE} ${MLIR_LINALG_ODS_YAML_GEN_TARGET} ${GEN_ODS_FILE} ${GEN_CPP_FILE}) + set_target_properties(MLIR${output_file}YamlIncGen PROPERTIES FOLDER "MLIR/Tablegenning/Targets") list(APPEND LLVM_TARGET_DEPENDS ${GEN_ODS_FILE}) set(LLVM_TARGET_DEPENDS ${LLVM_TARGET_DEPENDS} PARENT_SCOPE) endfunction() @@ -40,6 +41,7 @@ add_custom_target(LinalgOdsGen DEPENDS MLIRLinalgNamedStructuredOpsYamlIncGen ) +set_target_properties(LinalgOdsGen PROPERTIES FOLDER "MLIR/Tablegenning/Targets") add_dependencies(mlir-headers LinalgOdsGen) add_mlir_dialect(LinalgOps linalg) diff --git a/mlir/lib/TableGen/CMakeLists.txt b/mlir/lib/TableGen/CMakeLists.txt index 61e14feb6dc12..c4104e644147c 100644 --- a/mlir/lib/TableGen/CMakeLists.txt +++ b/mlir/lib/TableGen/CMakeLists.txt @@ -40,6 +40,7 @@ llvm_add_library(MLIRTableGen STATIC ${MLIR_MAIN_INCLUDE_DIR}/mlir/TableGen ${MLIR_MAIN_INCLUDE_DIR}/mlir/Support ) +set_target_properties(MLIRTableGen PROPERTIES FOLDER "MLIR/Tablegenning") mlir_check_all_link_libraries(MLIRTableGen) diff --git a/mlir/test/CAPI/CMakeLists.txt b/mlir/test/CAPI/CMakeLists.txt index b9cd63ef7c673..065bf636106ba 100644 --- a/mlir/test/CAPI/CMakeLists.txt +++ b/mlir/test/CAPI/CMakeLists.txt @@ -9,6 +9,8 @@ function(_add_capi_test_executable name) add_llvm_executable(${name} PARTIAL_SOURCES_INTENDED ${ARG_UNPARSED_ARGUMENTS}) + set_target_properties(${name} PROPERTIES FOLDER "MLIR/Tests") + llvm_update_compile_flags(${name}) if(MLIR_BUILD_MLIR_C_DYLIB) target_link_libraries(${name} PRIVATE diff --git a/mlir/test/CMakeLists.txt b/mlir/test/CMakeLists.txt index 5319a9cb33e00..a1ac404d9288c 100644 --- a/mlir/test/CMakeLists.txt +++ b/mlir/test/CMakeLists.txt @@ -216,12 +216,12 @@ endif() add_custom_target(check-mlir-build-only DEPENDS ${MLIR_TEST_DEPENDS} ) +set_target_properties(check-mlir-build-only PROPERTIES FOLDER "MLIR/Tests") add_lit_testsuite(check-mlir "Running the MLIR regression tests" ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${MLIR_TEST_DEPENDS} ) -set_target_properties(check-mlir PROPERTIES FOLDER "Tests") add_lit_testsuites(MLIR ${CMAKE_CURRENT_SOURCE_DIR} DEPENDS ${MLIR_TEST_DEPENDS} diff --git a/mlir/tools/mlir-linalg-ods-gen/CMakeLists.txt b/mlir/tools/mlir-linalg-ods-gen/CMakeLists.txt index 787a0bb35d7b1..ef5ce8882ec76 100644 --- a/mlir/tools/mlir-linalg-ods-gen/CMakeLists.txt +++ b/mlir/tools/mlir-linalg-ods-gen/CMakeLists.txt @@ -18,6 +18,7 @@ setup_host_tool(mlir-linalg-ods-yaml-gen MLIR_LINALG_ODS_YAML_GEN MLIR_LINALG_OD if(NOT ${MLIR_LINALG_ODS_YAML_GEN_EXE} STREQUAL "mlir-linalg-ods-yaml-gen") add_custom_target(mlir-linalg-ods-yaml-gen-host DEPENDS ${MLIR_LINALG_ODS_YAML_GEN_EXE}) + set_target_properties(mlir-linalg-ods-yaml-gen-host PROPERTIES FOLDER "MLIR/Tablegenning") if(NOT LLVM_BUILD_UTILS) set_target_properties(mlir-linalg-ods-yaml-gen PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/mlir/tools/mlir-pdll/CMakeLists.txt b/mlir/tools/mlir-pdll/CMakeLists.txt index 67b65d7ad5723..35b8870a1b1a6 100644 --- a/mlir/tools/mlir-pdll/CMakeLists.txt +++ b/mlir/tools/mlir-pdll/CMakeLists.txt @@ -21,7 +21,6 @@ add_tablegen(mlir-pdll MLIR_PDLL ${LIBS} ) -set_target_properties(mlir-pdll PROPERTIES FOLDER "Tablegenning") target_link_libraries(mlir-pdll PRIVATE ${LIBS}) mlir_check_all_link_libraries(mlir-pdll) diff --git a/mlir/tools/mlir-tblgen/CMakeLists.txt b/mlir/tools/mlir-tblgen/CMakeLists.txt index f2c5e4b3f87af..20a200bc35408 100644 --- a/mlir/tools/mlir-tblgen/CMakeLists.txt +++ b/mlir/tools/mlir-tblgen/CMakeLists.txt @@ -33,7 +33,6 @@ add_tablegen(mlir-tblgen MLIR SPIRVUtilsGen.cpp ) -set_target_properties(mlir-tblgen PROPERTIES FOLDER "Tablegenning") target_link_libraries(mlir-tblgen PRIVATE MLIRTblgenLib) diff --git a/mlir/unittests/CMakeLists.txt b/mlir/unittests/CMakeLists.txt index 6fad249a0b2fb..89332bce5fe05 100644 --- a/mlir/unittests/CMakeLists.txt +++ b/mlir/unittests/CMakeLists.txt @@ -1,5 +1,3 @@ -set_target_properties(MLIRUnitTests PROPERTIES FOLDER "MLIR Tests") - # To silence warning caused by Wundef. add_definitions(-DGTEST_NO_LLVM_SUPPORT=0) diff --git a/openmp/CMakeLists.txt b/openmp/CMakeLists.txt index 3c4ff76ad6d16..328b7e47e1728 100644 --- a/openmp/CMakeLists.txt +++ b/openmp/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "OpenMP") set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) diff --git a/openmp/docs/CMakeLists.txt b/openmp/docs/CMakeLists.txt index 1e4be31a6f609..4cb9fb486ff34 100644 --- a/openmp/docs/CMakeLists.txt +++ b/openmp/docs/CMakeLists.txt @@ -78,6 +78,7 @@ if (LLVM_ENABLE_DOXYGEN) COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating openmp doxygen documentation." VERBATIM) + set_target_properties(doxygen-openmp PROPERTIES FOLDER "OpenMP/Docs") if (LLVM_BUILD_DOCS) add_dependencies(doxygen doxygen-openmp) diff --git a/openmp/libomptarget/unittests/CMakeLists.txt b/openmp/libomptarget/unittests/CMakeLists.txt index 73c87b708d25f..c818a3d985ba3 100644 --- a/openmp/libomptarget/unittests/CMakeLists.txt +++ b/openmp/libomptarget/unittests/CMakeLists.txt @@ -1,5 +1,5 @@ add_custom_target(LibomptUnitTests) -set_target_properties(LibomptUnitTests PROPERTIES FOLDER "Tests/UnitTests") +set_target_properties(LibomptUnitTests PROPERTIES FOLDER "Tests") function(add_libompt_unittest test_dirname) add_unittest(LibomptUnitTests ${test_dirname} ${ARGN}) diff --git a/openmp/runtime/cmake/LibompMicroTests.cmake b/openmp/runtime/cmake/LibompMicroTests.cmake index e8cc218af0c29..6fcde37259931 100644 --- a/openmp/runtime/cmake/LibompMicroTests.cmake +++ b/openmp/runtime/cmake/LibompMicroTests.cmake @@ -126,6 +126,7 @@ macro(libomp_test_touch_recipe test_touch_dir) endmacro() libomp_append(libomp_test_touch_env "KMP_VERSION=1") add_custom_target(libomp-test-touch DEPENDS ${libomp_test_touch_targets}) +set_target_properties(libomp-test-touch PROPERTIES FOLDER "OpenMP/Tests") if(WIN32) libomp_test_touch_recipe(test-touch-mt) libomp_test_touch_recipe(test-touch-md) @@ -135,6 +136,7 @@ endif() # test-relo add_custom_target(libomp-test-relo DEPENDS test-relo/.success) +set_target_properties(libomp-test-relo PROPERTIES FOLDER "OpenMP/Tests") add_custom_command( OUTPUT test-relo/.success test-relo/readelf.log COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/test-relo @@ -146,6 +148,7 @@ add_custom_command( # test-execstack add_custom_target(libomp-test-execstack DEPENDS test-execstack/.success) +set_target_properties(libomp-test-execstack PROPERTIES FOLDER "OpenMP/Tests") add_custom_command( OUTPUT test-execstack/.success COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/test-execstack @@ -157,6 +160,7 @@ add_custom_command( # test-instr add_custom_target(libomp-test-instr DEPENDS test-instr/.success) +set_target_properties(libomp-test-instr PROPERTIES FOLDER "OpenMP/Tests") add_custom_command( OUTPUT test-instr/.success COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/test-instr @@ -168,6 +172,7 @@ add_custom_command( # test-deps add_custom_target(libomp-test-deps DEPENDS test-deps/.success) +set_target_properties(libomp-test-deps PROPERTIES FOLDER "OpenMP/Tests") set(libomp_expected_library_deps) if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") set(libomp_expected_library_deps libc.so.7 libthr.so.3 libm.so.5) diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt index 701c35150f304..3fac4f5f97934 100644 --- a/openmp/runtime/src/CMakeLists.txt +++ b/openmp/runtime/src/CMakeLists.txt @@ -171,6 +171,7 @@ libomp_get_libflags(LIBOMP_CONFIGURED_LIBFLAGS) # Build libomp library. Add LLVMSupport dependency if building in-tree with libomptarget profiling enabled. if(OPENMP_STANDALONE_BUILD OR (NOT OPENMP_ENABLE_LIBOMP_PROFILING)) add_library(omp ${LIBOMP_LIBRARY_KIND} ${LIBOMP_SOURCE_FILES}) + set_property(TARGET omp PROPERTY FOLDER "OpenMP/Libraries") # Linking command will include libraries in LIBOMP_CONFIGURED_LIBFLAGS target_link_libraries(omp ${LIBOMP_CONFIGURED_LIBFLAGS} ${LIBOMP_DL_LIBS}) else() @@ -246,6 +247,7 @@ set(LIBOMP_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) # Create *.inc before compiling any sources # objects depend on : .inc files add_custom_target(libomp-needed-headers DEPENDS kmp_i18n_id.inc kmp_i18n_default.inc) +set_target_properties(libomp-needed-headers PROPERTIES FOLDER "OpenMP/Tablegenning") add_dependencies(omp libomp-needed-headers) # Windows specific build rules @@ -287,6 +289,7 @@ if(WIN32) set(LIBOMP_IMP_LIB_TARGET omp) set(LIBOMP_GENERATED_DEF_FILE ${LIBOMP_LIB_NAME}.def) add_custom_target(libomp-needed-def-file DEPENDS ${LIBOMP_GENERATED_DEF_FILE}) + set_target_properties(libomp-needed-def-file PROPERTIES FOLDER "OpenMP/Tablegenning") add_dependencies(omp libomp-needed-def-file) # Create the main def file with ordinals to use for building the runtime dll to maintain backwards compatible exports order @@ -305,6 +308,7 @@ if(WIN32) # Create the auxiliary def file without ordinals to use for building the import library to import by name set(LIBOMPIMP_GENERATED_DEF_FILE ${LIBOMP_LIB_NAME}.imp.def) add_custom_target(libompimp-needed-def-file DEPENDS ${LIBOMPIMP_GENERATED_DEF_FILE}) + set_target_properties(libompimp-needed-def-file PROPERTIES FOLDER "OpenMP/Resources") add_custom_command( OUTPUT ${LIBOMPIMP_GENERATED_DEF_FILE} COMMAND ${PERL_EXECUTABLE} ${LIBOMP_TOOLS_DIR}/generate-def.pl ${LIBOMP_GDFLAGS} -D NAME=${LIBOMP_LIB_FILE} -D NOORDINALS @@ -314,6 +318,7 @@ if(WIN32) # while this merely generates an import library off a def file, CMAKE still requires it to have a "source" so feed it a dummy one, # making it a .txt which CMAKE will filter out from the librarian (a .cpp will make lib.exe punt trying to resolve the .def symbols) add_library(${LIBOMP_IMP_LIB_TARGET} STATIC kmp_dummy.txt) + set_target_properties(${LIBOMP_IMP_LIB_TARGET} PROPERTIES FOLDER "OpenMP/Resources") set_target_properties(${LIBOMP_IMP_LIB_TARGET} PROPERTIES PREFIX "" SUFFIX "" OUTPUT_NAME "${LIBOMP_IMP_LIB_FILE}" LINKER_LANGUAGE ${LIBOMP_LINKER_LANGUAGE} STATIC_LIBRARY_OPTIONS "${CMAKE_LINK_DEF_FILE_FLAG}${CMAKE_CURRENT_BINARY_DIR}/${LIBOMPIMP_GENERATED_DEF_FILE}") @@ -349,6 +354,7 @@ elseif(${LIBOMP_FORTRAN_MODULES}) set(ADDITIONAL_Fortran_FLAGS "-fno-range-check") endif() add_custom_target(libomp-mod ALL DEPENDS omp_lib.mod omp_lib_kinds.mod) + set_target_properties(libomp-mod PROPERTIES FOLDER "OpenMP/Misc") libomp_get_fflags(LIBOMP_CONFIGURED_FFLAGS) if(CMAKE_Fortran_COMPILER_SUPPORTS_F90) set(LIBOMP_FORTRAN_SOURCE_FILE omp_lib.F90) @@ -374,6 +380,7 @@ endif() # Micro test rules for after library has been built (cmake/LibompMicroTests.cmake) include(LibompMicroTests) add_custom_target(libomp-micro-tests) +set_target_properties(libomp-micro-tests PROPERTIES FOLDER "OpenMP/Tests") if(NOT ${MIC} AND NOT CMAKE_CROSSCOMPILING) add_dependencies(libomp-micro-tests libomp-test-touch) endif() diff --git a/polly/CMakeLists.txt b/polly/CMakeLists.txt index 5d0f2cd7f00ec..a0d1ab49e7837 100644 --- a/polly/CMakeLists.txt +++ b/polly/CMakeLists.txt @@ -4,6 +4,7 @@ if (NOT DEFINED LLVM_MAIN_SRC_DIR) cmake_minimum_required(VERSION 3.20.0) set(POLLY_STANDALONE_BUILD TRUE) endif() +set(LLVM_SUBPROJECT_TITLE "Polly") # Must go below project(..) include(GNUInstallDirs) @@ -157,8 +158,8 @@ foreach (file IN LISTS files) endforeach () add_custom_target(polly-check-format DEPENDS ${check_format_depends}) -set_target_properties(polly-check-format PROPERTIES FOLDER "Polly") +set_target_properties(polly-check-format PROPERTIES FOLDER "Polly/Meta") add_custom_target(polly-update-format DEPENDS ${update_format_depends}) -set_target_properties(polly-update-format PROPERTIES FOLDER "Polly") +set_target_properties(polly-update-format PROPERTIES FOLDER "Polly/Meta") diff --git a/polly/cmake/polly_macros.cmake b/polly/cmake/polly_macros.cmake index df541eeccc4cb..b1bd1e1b03cda 100644 --- a/polly/cmake/polly_macros.cmake +++ b/polly/cmake/polly_macros.cmake @@ -21,7 +21,7 @@ macro(add_polly_library name) set(libkind) endif() add_library( ${name} ${libkind} ${srcs} ) - set_target_properties(${name} PROPERTIES FOLDER "Polly") + set_target_properties(${name} PROPERTIES FOLDER "Polly/Libraries") if( LLVM_COMMON_DEPENDS ) add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} ) diff --git a/polly/docs/CMakeLists.txt b/polly/docs/CMakeLists.txt index a1ef5ce5277f7..2bd16e53c542f 100644 --- a/polly/docs/CMakeLists.txt +++ b/polly/docs/CMakeLists.txt @@ -77,6 +77,7 @@ if (LLVM_ENABLE_DOXYGEN) COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.cfg WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generating polly doxygen documentation." VERBATIM) + set_target_properties(doxygen-polly PROPERTIES FOLDER "Polly/Docs") if (LLVM_BUILD_DOCS) add_dependencies(doxygen doxygen-polly) diff --git a/polly/lib/CMakeLists.txt b/polly/lib/CMakeLists.txt index 4557878e515e6..f18cdcd09cfca 100644 --- a/polly/lib/CMakeLists.txt +++ b/polly/lib/CMakeLists.txt @@ -92,8 +92,6 @@ add_llvm_pass_plugin(Polly LINK_COMPONENTS ${POLLY_COMPONENTS} ) -set_target_properties(obj.Polly PROPERTIES FOLDER "Polly") -set_target_properties(Polly PROPERTIES FOLDER "Polly") if (MSVC_IDE OR XCODE) # Configure source groups for Polly source files. By default, in the IDE there @@ -120,7 +118,7 @@ if (WIN32 OR CYGWIN OR NOT LLVM_ENABLE_PIC) # Add dummy target, either because loadable modules are not supported # as on Windows or because PIC code has been disabled add_custom_target(LLVMPolly) - set_target_properties(LLVMPolly PROPERTIES FOLDER "Polly") + set_target_properties(LLVMPolly PROPERTIES FOLDER "Polly/Meta") else () add_polly_loadable_module(LLVMPolly Plugin/Polly.cpp diff --git a/polly/test/CMakeLists.txt b/polly/test/CMakeLists.txt index 81cee34a780d6..338c7dbfa1158 100644 --- a/polly/test/CMakeLists.txt +++ b/polly/test/CMakeLists.txt @@ -1,7 +1,7 @@ set(LLVM_SHLIBEXT "${CMAKE_SHARED_MODULE_SUFFIX}") add_custom_target(check-polly) -set_target_properties(check-polly PROPERTIES FOLDER "Polly") +set_target_properties(check-polly PROPERTIES FOLDER "Polly/Tests") if(NOT LLVM_MAIN_SRC_DIR) find_program(LLVM_OPT NAMES opt HINTS ${LLVM_TOOLS_BINARY_DIR}) @@ -64,7 +64,6 @@ add_lit_testsuite(check-polly-tests "Running polly regression tests" polly_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg DEPENDS ${POLLY_TEST_DEPS} ) -set_target_properties(check-polly-tests PROPERTIES FOLDER "Polly") add_dependencies(check-polly check-polly-tests) configure_lit_site_cfg( @@ -80,7 +79,6 @@ if (POLLY_GTEST_AVAIL) EXCLUDE_FROM_CHECK_ALL DEPENDS PollyUnitTests ) - set_target_properties(check-polly-unittests PROPERTIES FOLDER "Polly") endif () configure_file( @@ -94,7 +92,6 @@ if (POLLY_BUNDLED_ISL) EXCLUDE_FROM_CHECK_ALL DEPENDS polly-isl-test ) - set_target_properties(check-polly-isl PROPERTIES FOLDER "Polly") endif (POLLY_BUNDLED_ISL) # Run polly-check-format as part of polly-check only if we are compiling with @@ -114,5 +111,5 @@ configure_file( # Add a legacy target spelling: polly-test add_custom_target(polly-test) -set_target_properties(polly-test PROPERTIES FOLDER "Polly") +set_target_properties(polly-test PROPERTIES FOLDER "Polly/Tests") add_dependencies(polly-test check-polly) diff --git a/polly/unittests/CMakeLists.txt b/polly/unittests/CMakeLists.txt index 94b75449c3022..58dd5991043e2 100644 --- a/polly/unittests/CMakeLists.txt +++ b/polly/unittests/CMakeLists.txt @@ -14,7 +14,7 @@ function(add_polly_unittest test_name) target_link_libraries(${test_name} PRIVATE gtest_main gtest) add_dependencies(PollyUnitTests ${test_name}) - set_property(TARGET ${test_name} PROPERTY FOLDER "Polly") + set_property(TARGET ${test_name} PROPERTY FOLDER "Polly/Tests/Unittests") endif() if(LLVM_LINK_LLVM_DYLIB AND LLVM_POLLY_LINK_INTO_TOOLS) diff --git a/pstl/CMakeLists.txt b/pstl/CMakeLists.txt index 255e22af9a26b..592e11d356473 100644 --- a/pstl/CMakeLists.txt +++ b/pstl/CMakeLists.txt @@ -6,6 +6,7 @@ # #===----------------------------------------------------------------------===## cmake_minimum_required(VERSION 3.20.0) +set(LLVM_SUBPROJECT_TITLE "Parallel STL") set(PARALLELSTL_VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/include/pstl/internal/pstl_config.h") file(STRINGS "${PARALLELSTL_VERSION_FILE}" PARALLELSTL_VERSION_SOURCE REGEX "#define _PSTL_VERSION .*$") diff --git a/runtimes/CMakeLists.txt b/runtimes/CMakeLists.txt index 6f24fbcccec95..3d367cd7f5f13 100644 --- a/runtimes/CMakeLists.txt +++ b/runtimes/CMakeLists.txt @@ -9,6 +9,7 @@ include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake include(${LLVM_COMMON_CMAKE_UTILS}/Modules/LLVMVersion.cmake) project(Runtimes C CXX ASM) +set(LLVM_SUBPROJECT_TITLE "Runtimes") list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}/cmake"