diff options
| author | Stefan Granitz <stefan.graenitz@gmail.com> | 2019-07-18 16:44:45 +0000 |
|---|---|---|
| committer | Stefan Granitz <stefan.graenitz@gmail.com> | 2019-07-18 16:44:45 +0000 |
| commit | 6454a20b72b625fbf7de8146428103df3b71e8e2 (patch) | |
| tree | fd7379c02de354f6a022a2316a5604aea60be0e9 | |
| parent | 40073f922a82a2ba5a847a75bdeea66483d5b286 (diff) | |
| download | bcm5719-llvm-6454a20b72b625fbf7de8146428103df3b71e8e2.tar.gz bcm5719-llvm-6454a20b72b625fbf7de8146428103df3b71e8e2.zip | |
[CMake] Polish folders in generated Xcode project
Summary: Group plugins by subfolder. Move liblldb-resource-headers to `lldb misc`. Avoid install-distribution related targets in IDE-enabled builds.
Reviewers: jingham, mib, stella.stamenova
Subscribers: mgorny, lldb-commits, #lldb
Tags: #lldb
Differential Revision: https://reviews.llvm.org/D64865
llvm-svn: 366459
| -rw-r--r-- | lldb/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lldb/cmake/modules/AddLLDB.cmake | 6 | ||||
| -rw-r--r-- | lldb/cmake/modules/LLDBFramework.cmake | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt index 609aa0bd2a6..a963ed6ba6b 100644 --- a/lldb/CMakeLists.txt +++ b/lldb/CMakeLists.txt @@ -234,6 +234,6 @@ if (NOT LLDB_DISABLE_PYTHON) endif () endif () -if(LLDB_BUILT_STANDALONE) +if(LLDB_BUILT_STANDALONE AND NOT LLVM_ENABLE_IDE) llvm_distribution_add_targets() endif() diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake index 4c99278c583..d8fc1ab7db6 100644 --- a/lldb/cmake/modules/AddLLDB.cmake +++ b/lldb/cmake/modules/AddLLDB.cmake @@ -122,7 +122,11 @@ function(add_lldb_library name) target_compile_options(${name} PRIVATE ${PARAM_EXTRA_CXXFLAGS}) if(PARAM_PLUGIN) - set_target_properties(${name} PROPERTIES FOLDER "lldb plugins") + 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}") + endif() else() set_target_properties(${name} PROPERTIES FOLDER "lldb libraries") endif() diff --git a/lldb/cmake/modules/LLDBFramework.cmake b/lldb/cmake/modules/LLDBFramework.cmake index f5f3cd4d60a..7a00ec49fde 100644 --- a/lldb/cmake/modules/LLDBFramework.cmake +++ b/lldb/cmake/modules/LLDBFramework.cmake @@ -78,6 +78,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") add_dependencies(liblldb liblldb-resource-headers) # At build time, copy the staged headers into the framework bundle (and do |
