[llvm-branch-commits] [lld] [lld] Revise IDE folder structure (PR #89747)
https://github.com/Meinersbur reopened https://github.com/llvm/llvm-project/pull/89747 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [lld] [lld] Revise IDE folder structure (PR #89747)
https://github.com/Meinersbur closed https://github.com/llvm/llvm-project/pull/89747 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [lld] [lld] Revise IDE folder structure (PR #89747)
https://github.com/Meinersbur updated https://github.com/llvm/llvm-project/pull/89747 >From 6c3206c8100ed68ab77ceb98741bef42659bcfc1 Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Tue, 23 Apr 2024 13:12:03 +0200 Subject: [PATCH] [lld] Revise IDE folder structure --- lld/CMakeLists.txt | 2 ++ lld/cmake/modules/AddLLD.cmake | 2 -- lld/test/CMakeLists.txt| 5 ++--- lld/unittests/CMakeLists.txt | 2 -- 4 files changed, 4 insertions(+), 7 deletions(-) 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() ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [lld] [lld] Revise IDE folder structure (PR #89747)
llvmbot wrote: @llvm/pr-subscribers-lld Author: Michael Kruse (Meinersbur) Changes Reviewers of #89153 suggested to break up the patch into per-subproject patches. This is the LLD part. See #89153 for the entire series and motivation. Update the folder titles for targets in the monorepository that have not seen taken care of for some time. These are the folders that targets are organized in Visual Studio and XCode (`set_property(TARGET target PROPERTY FOLDER "title")`) when using the respective CMake's IDE generator. * Ensure that every target is in a folder * Use a folder hierarchy with each LLVM subproject as a top-level folder * Use consistent folder names between subprojects * When using target-creating functions from AddLLVM.cmake, automatically deduce the folder. This reduces the number of `set_property`/`set_target_property`, but are still necessary when `add_custom_target`, `add_executable`, `add_library`, etc. are used. A LLVM_SUBPROJECT_TITLE definition is used for that in each subproject's root CMakeLists.txt. --- Full diff: https://github.com/llvm/llvm-project/pull/89747.diff 4 Files Affected: - (modified) lld/CMakeLists.txt (+2) - (modified) lld/cmake/modules/AddLLD.cmake (-2) - (modified) lld/test/CMakeLists.txt (+2-3) - (modified) lld/unittests/CMakeLists.txt (-2) ``diff 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() `` https://github.com/llvm/llvm-project/pull/89747 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [lld] [lld] Revise IDE folder structure (PR #89747)
https://github.com/Meinersbur ready_for_review https://github.com/llvm/llvm-project/pull/89747 ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [lld] [lld] Revise IDE folder structure (PR #89747)
https://github.com/Meinersbur created https://github.com/llvm/llvm-project/pull/89747 Reviewers of #89153 suggested to break up the patch into per-subproject patches. This is the LLD part. See #89153 for the entire series and motivation. Update the folder titles for targets in the monorepository that have not seen taken care of for some time. These are the folders that targets are organized in Visual Studio and XCode (`set_property(TARGET PROPERTY FOLDER "")`) when using the respective CMake's IDE generator. * Ensure that every target is in a folder * Use a folder hierarchy with each LLVM subproject as a top-level folder * Use consistent folder names between subprojects * When using target-creating functions from AddLLVM.cmake, automatically deduce the folder. This reduces the number of `set_property`/`set_target_property`, but are still necessary when `add_custom_target`, `add_executable`, `add_library`, etc. are used. A LLVM_SUBPROJECT_TITLE definition is used for that in each subproject's root CMakeLists.txt. >From 6c3206c8100ed68ab77ceb98741bef42659bcfc1 Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Tue, 23 Apr 2024 13:12:03 +0200 Subject: [PATCH] [lld] Revise IDE folder structure --- lld/CMakeLists.txt | 2 ++ lld/cmake/modules/AddLLD.cmake | 2 -- lld/test/CMakeLists.txt| 5 ++--- lld/unittests/CMakeLists.txt | 2 -- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt index cd8ba627306edb..64c9f238055092 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 2ee066b4153519..9f2684b6f933ec 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 bb6164f19dcef3..25d8f0a424926d 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 ac878fa0190833..ffaea3f2078330 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() ___ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits