[CMake] Polish folders in generated Xcode project

[sgraenitz]

Summary

Group plugins by subfolder. Move liblldb-resource-headers to lldb misc. Avoid install-distribution related targets in IDE-enabled builds.

[sgraenitz]

Should give this folder structure in Xcode standalone builds:

We try to cut the parent folder names from the leaf folders, but that gets a mess quickly as not all names are consistent with their parent directories.

[sgraenitz]

I am going to land this, its cosmetics and the 9.0 branch was cut.

lldb/trunk/CMakeLists.txt

if (WIN32 AND NOT "${PYTHON_DLL}" STREQUAL "")
         add_custom_command(
             TARGET finish_swig
             POST_BUILD
             COMMAND ${CMAKE_COMMAND} -E copy ${PYTHON_DLL_NATIVE_PATH} ${LLDB_BIN_DIR} VERBATIM
             COMMENT "Copying Python DLL to LLDB binaries directory.")
     endif ()
 endif ()
 
-if(LLDB_BUILT_STANDALONE)
+if(LLDB_BUILT_STANDALONE AND NOT LLVM_ENABLE_IDE)
   llvm_distribution_add_targets()
 endif()

lldb/trunk/cmake/modules/AddLLDB.cmake

)
   if(NOT LLDB_BUILT_STANDALONE)
     add_dependencies(${name} clang-tablegen-targets)
   endif()
 
   # Add in any extra C++ compilation flags for this library.
   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()
 endfunction(add_lldb_library)
 
 function(add_lldb_executable name)
   cmake_parse_arguments(ARG
     "GENERATE_INSTALL"

lldb/trunk/cmake/modules/LLDBFramework.cmake

add_custom_command(
     COMMAND ${CMAKE_COMMAND} -E copy ${header} ${staged_header}
     COMMENT "LLDB.framework: collect framework header")
 
   list(APPEND lldb_staged_headers ${staged_header})
 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
 # some post-processing in-place).
 add_custom_command(TARGET liblldb POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E copy_directory ${lldb_header_staging} $<TARGET_FILE_DIR:liblldb>/Headers
   COMMAND ${LLDB_SOURCE_DIR}/scripts/framework-header-fix.sh $<TARGET_FILE_DIR:liblldb>/Headers ${LLDB_VERSION}
   COMMENT "LLDB.framework: copy framework headers"