[llvm-branch-commits] [compiler-rt] [llvm] [openmp] [compiler-rt] Revise IDE folder structure (PR #89753)
https://github.com/Meinersbur updated https://github.com/llvm/llvm-project/pull/89753 >From 19ef183fcfb44fa8b9bae34bdc8eafb8d2425722 Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Tue, 23 Apr 2024 13:15:38 +0200 Subject: [PATCH 1/4] [compiler-rt] Revise IDE folder structure --- compiler-rt/CMakeLists.txt| 3 ++- compiler-rt/cmake/Modules/AddCompilerRT.cmake | 21 ++- .../cmake/Modules/CompilerRTDarwinUtils.cmake | 4 ++-- .../cmake/Modules/CompilerRTUtils.cmake | 4 ++-- compiler-rt/cmake/base-config-ix.cmake| 4 ++-- compiler-rt/include/CMakeLists.txt| 2 +- compiler-rt/lib/asan/tests/CMakeLists.txt | 8 +++ compiler-rt/lib/builtins/CMakeLists.txt | 2 +- compiler-rt/lib/fuzzer/tests/CMakeLists.txt | 6 +++--- compiler-rt/lib/gwp_asan/tests/CMakeLists.txt | 4 ++-- .../lib/interception/tests/CMakeLists.txt | 4 ++-- compiler-rt/lib/memprof/tests/CMakeLists.txt | 4 ++-- compiler-rt/lib/orc/tests/CMakeLists.txt | 6 +++--- .../lib/sanitizer_common/tests/CMakeLists.txt | 4 ++-- compiler-rt/lib/stats/CMakeLists.txt | 2 +- compiler-rt/lib/tsan/CMakeLists.txt | 2 +- compiler-rt/lib/tsan/dd/CMakeLists.txt| 2 +- compiler-rt/lib/tsan/rtl/CMakeLists.txt | 2 +- compiler-rt/lib/xray/tests/CMakeLists.txt | 4 ++-- compiler-rt/test/CMakeLists.txt | 1 + compiler-rt/test/asan/CMakeLists.txt | 3 --- compiler-rt/test/asan_abi/CMakeLists.txt | 1 - compiler-rt/test/builtins/CMakeLists.txt | 1 - compiler-rt/test/cfi/CMakeLists.txt | 3 --- compiler-rt/test/dfsan/CMakeLists.txt | 1 - compiler-rt/test/fuzzer/CMakeLists.txt| 1 - compiler-rt/test/gwp_asan/CMakeLists.txt | 1 - compiler-rt/test/hwasan/CMakeLists.txt| 2 -- compiler-rt/test/interception/CMakeLists.txt | 1 - compiler-rt/test/lsan/CMakeLists.txt | 1 - compiler-rt/test/memprof/CMakeLists.txt | 3 --- compiler-rt/test/metadata/CMakeLists.txt | 1 - compiler-rt/test/msan/CMakeLists.txt | 1 - compiler-rt/test/orc/CMakeLists.txt | 1 - compiler-rt/test/profile/CMakeLists.txt | 1 - compiler-rt/test/safestack/CMakeLists.txt | 1 - .../test/sanitizer_common/CMakeLists.txt | 2 -- .../test/shadowcallstack/CMakeLists.txt | 1 - compiler-rt/test/tsan/CMakeLists.txt | 1 - compiler-rt/test/ubsan/CMakeLists.txt | 2 -- compiler-rt/test/ubsan_minimal/CMakeLists.txt | 1 - compiler-rt/test/xray/CMakeLists.txt | 1 - 42 files changed, 46 insertions(+), 74 deletions(-) diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index 6ce451e3cac2e..65063e0057bbc 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) @@ -90,7 +91,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
[llvm-branch-commits] [compiler-rt] [llvm] [openmp] [compiler-rt] Revise IDE folder structure (PR #89753)
https://github.com/Meinersbur updated https://github.com/llvm/llvm-project/pull/89753 >From 19ef183fcfb44fa8b9bae34bdc8eafb8d2425722 Mon Sep 17 00:00:00 2001 From: Michael Kruse Date: Tue, 23 Apr 2024 13:15:38 +0200 Subject: [PATCH 1/5] [compiler-rt] Revise IDE folder structure --- compiler-rt/CMakeLists.txt| 3 ++- compiler-rt/cmake/Modules/AddCompilerRT.cmake | 21 ++- .../cmake/Modules/CompilerRTDarwinUtils.cmake | 4 ++-- .../cmake/Modules/CompilerRTUtils.cmake | 4 ++-- compiler-rt/cmake/base-config-ix.cmake| 4 ++-- compiler-rt/include/CMakeLists.txt| 2 +- compiler-rt/lib/asan/tests/CMakeLists.txt | 8 +++ compiler-rt/lib/builtins/CMakeLists.txt | 2 +- compiler-rt/lib/fuzzer/tests/CMakeLists.txt | 6 +++--- compiler-rt/lib/gwp_asan/tests/CMakeLists.txt | 4 ++-- .../lib/interception/tests/CMakeLists.txt | 4 ++-- compiler-rt/lib/memprof/tests/CMakeLists.txt | 4 ++-- compiler-rt/lib/orc/tests/CMakeLists.txt | 6 +++--- .../lib/sanitizer_common/tests/CMakeLists.txt | 4 ++-- compiler-rt/lib/stats/CMakeLists.txt | 2 +- compiler-rt/lib/tsan/CMakeLists.txt | 2 +- compiler-rt/lib/tsan/dd/CMakeLists.txt| 2 +- compiler-rt/lib/tsan/rtl/CMakeLists.txt | 2 +- compiler-rt/lib/xray/tests/CMakeLists.txt | 4 ++-- compiler-rt/test/CMakeLists.txt | 1 + compiler-rt/test/asan/CMakeLists.txt | 3 --- compiler-rt/test/asan_abi/CMakeLists.txt | 1 - compiler-rt/test/builtins/CMakeLists.txt | 1 - compiler-rt/test/cfi/CMakeLists.txt | 3 --- compiler-rt/test/dfsan/CMakeLists.txt | 1 - compiler-rt/test/fuzzer/CMakeLists.txt| 1 - compiler-rt/test/gwp_asan/CMakeLists.txt | 1 - compiler-rt/test/hwasan/CMakeLists.txt| 2 -- compiler-rt/test/interception/CMakeLists.txt | 1 - compiler-rt/test/lsan/CMakeLists.txt | 1 - compiler-rt/test/memprof/CMakeLists.txt | 3 --- compiler-rt/test/metadata/CMakeLists.txt | 1 - compiler-rt/test/msan/CMakeLists.txt | 1 - compiler-rt/test/orc/CMakeLists.txt | 1 - compiler-rt/test/profile/CMakeLists.txt | 1 - compiler-rt/test/safestack/CMakeLists.txt | 1 - .../test/sanitizer_common/CMakeLists.txt | 2 -- .../test/shadowcallstack/CMakeLists.txt | 1 - compiler-rt/test/tsan/CMakeLists.txt | 1 - compiler-rt/test/ubsan/CMakeLists.txt | 2 -- compiler-rt/test/ubsan_minimal/CMakeLists.txt | 1 - compiler-rt/test/xray/CMakeLists.txt | 1 - 42 files changed, 46 insertions(+), 74 deletions(-) diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt index 6ce451e3cac2e..65063e0057bbc 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) @@ -90,7 +91,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