Author: stefan.graenitz Date: Thu Jul 18 09:44:45 2019 New Revision: 366459
URL: http://llvm.org/viewvc/llvm-project?rev=366459&view=rev Log: [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 Modified: lldb/trunk/CMakeLists.txt lldb/trunk/cmake/modules/AddLLDB.cmake lldb/trunk/cmake/modules/LLDBFramework.cmake Modified: lldb/trunk/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/CMakeLists.txt?rev=366459&r1=366458&r2=366459&view=diff ============================================================================== --- lldb/trunk/CMakeLists.txt (original) +++ lldb/trunk/CMakeLists.txt Thu Jul 18 09:44:45 2019 @@ -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() Modified: lldb/trunk/cmake/modules/AddLLDB.cmake URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/AddLLDB.cmake?rev=366459&r1=366458&r2=366459&view=diff ============================================================================== --- lldb/trunk/cmake/modules/AddLLDB.cmake (original) +++ lldb/trunk/cmake/modules/AddLLDB.cmake Thu Jul 18 09:44:45 2019 @@ -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() Modified: lldb/trunk/cmake/modules/LLDBFramework.cmake URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/LLDBFramework.cmake?rev=366459&r1=366458&r2=366459&view=diff ============================================================================== --- lldb/trunk/cmake/modules/LLDBFramework.cmake (original) +++ lldb/trunk/cmake/modules/LLDBFramework.cmake Thu Jul 18 09:44:45 2019 @@ -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 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
