This revision was not accepted when it landed; it landed in state "Needs Review". This revision was automatically updated to reflect the committed changes. Closed by commit rL366459: [CMake] Polish folders in generated Xcode project (authored by stefan.graenitz, committed by ). Herald added a project: LLVM. Herald added a subscriber: llvm-commits.
Changed prior to commit: https://reviews.llvm.org/D64865?vs=210311&id=210611#toc Repository: rL LLVM CHANGES SINCE LAST ACTION https://reviews.llvm.org/D64865/new/ https://reviews.llvm.org/D64865 Files: lldb/trunk/CMakeLists.txt lldb/trunk/cmake/modules/AddLLDB.cmake lldb/trunk/cmake/modules/LLDBFramework.cmake Index: lldb/trunk/CMakeLists.txt =================================================================== --- lldb/trunk/CMakeLists.txt +++ lldb/trunk/CMakeLists.txt @@ -234,6 +234,6 @@ endif () endif () -if(LLDB_BUILT_STANDALONE) +if(LLDB_BUILT_STANDALONE AND NOT LLVM_ENABLE_IDE) llvm_distribution_add_targets() endif() Index: lldb/trunk/cmake/modules/LLDBFramework.cmake =================================================================== --- lldb/trunk/cmake/modules/LLDBFramework.cmake +++ lldb/trunk/cmake/modules/LLDBFramework.cmake @@ -78,6 +78,7 @@ # 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 Index: lldb/trunk/cmake/modules/AddLLDB.cmake =================================================================== --- lldb/trunk/cmake/modules/AddLLDB.cmake +++ lldb/trunk/cmake/modules/AddLLDB.cmake @@ -122,7 +122,11 @@ 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()
Index: lldb/trunk/CMakeLists.txt =================================================================== --- lldb/trunk/CMakeLists.txt +++ lldb/trunk/CMakeLists.txt @@ -234,6 +234,6 @@ endif () endif () -if(LLDB_BUILT_STANDALONE) +if(LLDB_BUILT_STANDALONE AND NOT LLVM_ENABLE_IDE) llvm_distribution_add_targets() endif() Index: lldb/trunk/cmake/modules/LLDBFramework.cmake =================================================================== --- lldb/trunk/cmake/modules/LLDBFramework.cmake +++ lldb/trunk/cmake/modules/LLDBFramework.cmake @@ -78,6 +78,7 @@ # 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 Index: lldb/trunk/cmake/modules/AddLLDB.cmake =================================================================== --- lldb/trunk/cmake/modules/AddLLDB.cmake +++ lldb/trunk/cmake/modules/AddLLDB.cmake @@ -122,7 +122,11 @@ 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()
_______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits