https://github.com/Meinersbur updated https://github.com/llvm/llvm-project/pull/89745
>From 90d0d0f3bed2d826dc38e962a7a9140bf2ff3615 Mon Sep 17 00:00:00 2001 From: Michael Kruse <llvm-proj...@meinersbur.de> Date: Tue, 23 Apr 2024 13:13:53 +0200 Subject: [PATCH 1/2] [flang] Revise IDE folder structure --- flang/CMakeLists.txt | 3 ++- flang/cmake/modules/AddFlang.cmake | 3 +-- flang/docs/CMakeLists.txt | 2 +- flang/include/flang/Optimizer/Dialect/CMakeLists.txt | 2 ++ flang/runtime/CMakeLists.txt | 5 +++++ flang/test/CMakeLists.txt | 3 ++- flang/tools/f18/CMakeLists.txt | 1 + flang/unittests/CMakeLists.txt | 3 ++- flang/unittests/Evaluate/CMakeLists.txt | 1 + 9 files changed, 17 insertions(+), 6 deletions(-) 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() >From 80b847a34a2f8bd4bdfdfc09a75b0bb4372d5f44 Mon Sep 17 00:00:00 2001 From: Michael Kruse <llvm-proj...@meinersbur.de> Date: Tue, 21 May 2024 22:08:34 +0200 Subject: [PATCH 2/2] Finetune Flang folders --- flang/include/flang/Optimizer/Dialect/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flang/include/flang/Optimizer/Dialect/CMakeLists.txt b/flang/include/flang/Optimizer/Dialect/CMakeLists.txt index 398c23005a28f..10ab213b30b02 100644 --- a/flang/include/flang/Optimizer/Dialect/CMakeLists.txt +++ b/flang/include/flang/Optimizer/Dialect/CMakeLists.txt @@ -33,7 +33,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_target_properties(flang-doc PROPERTIES FOLDER "Flang/Docs") set(dialect_doc_filename "FIRLangRef") set(LLVM_TARGET_DEFINITIONS FIROps.td) @@ -46,5 +46,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") +set_target_properties(${dialect_doc_filename}DocGen PROPERTIES FOLDER "Flang/Tablegenning/Docs") add_dependencies(flang-doc ${dialect_doc_filename}DocGen) _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits