Skip to content

[lld] Revise IDE folder structure #89747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jun 3, 2024
Merged

[lld] Revise IDE folder structure #89747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6f39beb
[llvm] Revise IDE folder structure
Meinersbur Apr 23, 2024
6c3206c
[lld] Revise IDE folder structure
Meinersbur Apr 23, 2024
dc66a30
Change the folder of exported symbols from "Misc" to "API".
Meinersbur Apr 23, 2024
9217419
Remove redundant FOLDER target property
Meinersbur Apr 24, 2024
ad4aa1f
Merge branch 'main' into HEAD
Meinersbur May 21, 2024
3ed19f5
Merge branch 'users/meinersbur/ide_folders_llvm' into ide_folders_lld
Meinersbur May 21, 2024
33b1f2e
Merge branch 'main' into ide_folders_lld
Meinersbur Jun 3, 2024
e3ebb83
Undo LLVM change
Meinersbur Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lld/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 0 additions & 2 deletions lld/cmake/modules/AddLLD.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
5 changes: 2 additions & 3 deletions lld/test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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")
2 changes: 0 additions & 2 deletions lld/unittests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
Expand Down
Loading