Author: stefan.graenitz Date: Tue May 28 02:29:05 2019 New Revision: 361799
URL: http://llvm.org/viewvc/llvm-project?rev=361799&view=rev Log: [CMake] Folder structure for generated Xcode project to cover more targets Modified: lldb/trunk/CMakeLists.txt lldb/trunk/cmake/modules/AddLLDB.cmake lldb/trunk/cmake/modules/LLDBConfig.cmake lldb/trunk/cmake/modules/LLDBStandalone.cmake lldb/trunk/lit/CMakeLists.txt lldb/trunk/source/API/CMakeLists.txt lldb/trunk/test/CMakeLists.txt lldb/trunk/tools/debugserver/source/CMakeLists.txt lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt lldb/trunk/tools/debugserver/source/MacOSX/DarwinLog/CMakeLists.txt lldb/trunk/tools/driver/CMakeLists.txt lldb/trunk/unittests/CMakeLists.txt lldb/trunk/unittests/tools/lldb-mi/utils/CMakeLists.txt lldb/trunk/unittests/tools/lldb-server/CMakeLists.txt lldb/trunk/utils/lit-cpuid/CMakeLists.txt lldb/trunk/utils/lldb-dotest/CMakeLists.txt Modified: lldb/trunk/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/CMakeLists.txt?rev=361799&r1=361798&r2=361799&view=diff ============================================================================== --- lldb/trunk/CMakeLists.txt (original) +++ lldb/trunk/CMakeLists.txt Tue May 28 02:29:05 2019 @@ -153,6 +153,7 @@ if(LLDB_INCLUDE_TESTS) add_custom_target(lldb-test-deps) add_dependencies(lldb-test-deps ${LLDB_TEST_DEPS}) + set_target_properties(lldb-test-deps PROPERTIES FOLDER "lldb misc") add_subdirectory(test) add_subdirectory(unittests) @@ -193,6 +194,7 @@ if (NOT LLDB_DISABLE_PYTHON) set(readline_dep readline) endif() add_dependencies(finish_swig swig_wrapper liblldb lldb-argdumper ${readline_dep}) + set_target_properties(finish_swig swig_wrapper PROPERTIES FOLDER "lldb misc") # Ensure we do the python post-build step when building lldb. add_dependencies(lldb finish_swig) Modified: lldb/trunk/cmake/modules/AddLLDB.cmake URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/AddLLDB.cmake?rev=361799&r1=361798&r2=361799&view=diff ============================================================================== --- lldb/trunk/cmake/modules/AddLLDB.cmake (original) +++ lldb/trunk/cmake/modules/AddLLDB.cmake Tue May 28 02:29:05 2019 @@ -100,7 +100,11 @@ function(add_lldb_library name) # Add in any extra C++ compilation flags for this library. target_compile_options(${name} PRIVATE ${PARAM_EXTRA_CXXFLAGS}) - set_target_properties(${name} PROPERTIES FOLDER "lldb libraries") + if(PARAM_PLUGIN) + set_target_properties(${name} PROPERTIES FOLDER "lldb plugins") + else() + set_target_properties(${name} PROPERTIES FOLDER "lldb libraries") + endif() endfunction(add_lldb_library) function(add_lldb_executable name) Modified: lldb/trunk/cmake/modules/LLDBConfig.cmake URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/LLDBConfig.cmake?rev=361799&r1=361798&r2=361799&view=diff ============================================================================== --- lldb/trunk/cmake/modules/LLDBConfig.cmake (original) +++ lldb/trunk/cmake/modules/LLDBConfig.cmake Tue May 28 02:29:05 2019 @@ -364,7 +364,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) ) add_custom_target(lldb-headers) - set_target_properties(lldb-headers PROPERTIES FOLDER "Misc") + set_target_properties(lldb-headers PROPERTIES FOLDER "lldb misc") if (NOT CMAKE_CONFIGURATION_TYPES) add_llvm_install_targets(install-lldb-headers Modified: lldb/trunk/cmake/modules/LLDBStandalone.cmake URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/modules/LLDBStandalone.cmake?rev=361799&r1=361798&r2=361799&view=diff ============================================================================== --- lldb/trunk/cmake/modules/LLDBStandalone.cmake (original) +++ lldb/trunk/cmake/modules/LLDBStandalone.cmake Tue May 28 02:29:05 2019 @@ -88,6 +88,14 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURR set(PACKAGE_VERSION "${LLVM_PACKAGE_VERSION}") set(LLVM_INCLUDE_TESTS ON CACHE INTERNAL "") + option(LLVM_USE_FOLDERS "Enable solution folders in Visual Studio. Disable for Express versions." ON) + if(LLVM_USE_FOLDERS) + set_property(GLOBAL PROPERTY USE_FOLDERS ON) + endif() + + set_target_properties(clang-tablegen-targets PROPERTIES FOLDER "lldb misc") + set_target_properties(intrinsics_gen PROPERTIES FOLDER "lldb misc") + set(CMAKE_INCLUDE_CURRENT_DIR ON) include_directories( "${CMAKE_BINARY_DIR}/include" Modified: lldb/trunk/lit/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/CMakeLists.txt?rev=361799&r1=361798&r2=361799&view=diff ============================================================================== --- lldb/trunk/lit/CMakeLists.txt (original) +++ lldb/trunk/lit/CMakeLists.txt Tue May 28 02:29:05 2019 @@ -68,7 +68,7 @@ add_lit_testsuite(check-lldb-lit "Runnin DEPENDS ${LLDB_TEST_DEPS} ) -set_target_properties(check-lldb-lit PROPERTIES FOLDER "LLDB tests") +set_target_properties(check-lldb-lit PROPERTIES FOLDER "lldb tests") # If we're building with an in-tree clang, then list clang as a dependency # to run tests. Modified: lldb/trunk/source/API/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/CMakeLists.txt?rev=361799&r1=361798&r2=361799&view=diff ============================================================================== --- lldb/trunk/source/API/CMakeLists.txt (original) +++ lldb/trunk/source/API/CMakeLists.txt Tue May 28 02:29:05 2019 @@ -144,6 +144,7 @@ if (NOT CMAKE_SYSTEM_NAME MATCHES "Windo MESSAGE("-- Symbols (liblldb): exporting all symbols from the lldb and lldb_private namespaces") add_llvm_symbol_exports(liblldb ${CMAKE_CURRENT_SOURCE_DIR}/liblldb-private.exports) endif() + set_target_properties(liblldb_exports PROPERTIES FOLDER "lldb misc") endif() if ( CMAKE_SYSTEM_NAME MATCHES "Windows" ) Modified: lldb/trunk/test/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/CMakeLists.txt?rev=361799&r1=361798&r2=361799&view=diff ============================================================================== --- lldb/trunk/test/CMakeLists.txt (original) +++ lldb/trunk/test/CMakeLists.txt Tue May 28 02:29:05 2019 @@ -110,13 +110,13 @@ add_python_test_target(check-lldb-single "--no-multiprocess;${LLDB_DOTEST_ARGS}" "Testing LLDB with args: ${LLDB_DOTEST_ARGS}" ) +set_target_properties(check-lldb-single PROPERTIES FOLDER "lldb misc") # If tests crash cause LLDB to crash, or things are otherwise unstable, or if machine-parsable # output is desired (i.e. in continuous integration contexts) check-lldb-single is a better target. add_custom_target(check-lldb) - -# Make check-lldb depend on all test dependencies. add_dependencies(check-lldb lldb-test-deps) +set_target_properties(check-lldb PROPERTIES FOLDER "lldb misc") # If we're building with an in-tree clang, then list clang as a dependency # to run tests. Modified: lldb/trunk/tools/debugserver/source/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/CMakeLists.txt?rev=361799&r1=361798&r2=361799&view=diff ============================================================================== --- lldb/trunk/tools/debugserver/source/CMakeLists.txt (original) +++ lldb/trunk/tools/debugserver/source/CMakeLists.txt Tue May 28 02:29:05 2019 @@ -236,6 +236,7 @@ if(build_and_sign_debugserver) ${DEBUGSERVER_VERS_GENERATED_FILE}) add_library(lldbDebugserverCommon ${lldbDebugserverCommonSources}) + set_target_properties(lldbDebugserverCommon PROPERTIES FOLDER "lldb libraries/debugserver") target_link_libraries(lldbDebugserverCommon INTERFACE ${COCOA_LIBRARY} Modified: lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt?rev=361799&r1=361798&r2=361799&view=diff ============================================================================== --- lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt (original) +++ lldb/trunk/tools/debugserver/source/MacOSX/CMakeLists.txt Tue May 28 02:29:05 2019 @@ -21,3 +21,5 @@ include_directories(${LLDB_SOURCE_DIR}/t add_library(lldbDebugserverArchSupport ${SOURCES} ) + +set_target_properties(lldbDebugserverArchSupport PROPERTIES FOLDER "lldb libraries/debugserver") Modified: lldb/trunk/tools/debugserver/source/MacOSX/DarwinLog/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/MacOSX/DarwinLog/CMakeLists.txt?rev=361799&r1=361798&r2=361799&view=diff ============================================================================== --- lldb/trunk/tools/debugserver/source/MacOSX/DarwinLog/CMakeLists.txt (original) +++ lldb/trunk/tools/debugserver/source/MacOSX/DarwinLog/CMakeLists.txt Tue May 28 02:29:05 2019 @@ -13,3 +13,5 @@ add_library(lldbDebugserverDarwin_Darwin LogMessage.cpp LogMessageOsLog.cpp ) + +set_target_properties(lldbDebugserverDarwin_DarwinLog PROPERTIES FOLDER "lldb libraries/debugserver") Modified: lldb/trunk/tools/driver/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/driver/CMakeLists.txt?rev=361799&r1=361798&r2=361799&view=diff ============================================================================== --- lldb/trunk/tools/driver/CMakeLists.txt (original) +++ lldb/trunk/tools/driver/CMakeLists.txt Tue May 28 02:29:05 2019 @@ -28,6 +28,8 @@ add_dependencies(lldb ${tablegen_deps} ) +set_target_properties(LLDBOptionsTableGen PROPERTIES FOLDER "lldb misc") + if(LLDB_BUILD_FRAMEWORK) lldb_setup_framework_rpaths_in_tool(lldb) endif() Modified: lldb/trunk/unittests/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/CMakeLists.txt?rev=361799&r1=361798&r2=361799&view=diff ============================================================================== --- lldb/trunk/unittests/CMakeLists.txt (original) +++ lldb/trunk/unittests/CMakeLists.txt Tue May 28 02:29:05 2019 @@ -1,5 +1,5 @@ add_custom_target(LLDBUnitTests) -set_target_properties(LLDBUnitTests PROPERTIES FOLDER "LLDB tests") +set_target_properties(LLDBUnitTests PROPERTIES FOLDER "lldb tests") include_directories(${LLDB_SOURCE_ROOT}) include_directories(${LLDB_PROJECT_ROOT}/unittests) Modified: lldb/trunk/unittests/tools/lldb-mi/utils/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/tools/lldb-mi/utils/CMakeLists.txt?rev=361799&r1=361798&r2=361799&view=diff ============================================================================== --- lldb/trunk/unittests/tools/lldb-mi/utils/CMakeLists.txt (original) +++ lldb/trunk/unittests/tools/lldb-mi/utils/CMakeLists.txt Tue May 28 02:29:05 2019 @@ -10,3 +10,4 @@ add_lldb_unittest(LLDBMiUtilTests ) target_sources(LLDBMiUtilTests PRIVATE $<TARGET_OBJECTS:lldb-mi-utils>) +set_target_properties(lldb-mi-utils PROPERTIES FOLDER "lldb libraries") Modified: lldb/trunk/unittests/tools/lldb-server/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/tools/lldb-server/CMakeLists.txt?rev=361799&r1=361798&r2=361799&view=diff ============================================================================== --- lldb/trunk/unittests/tools/lldb-server/CMakeLists.txt (original) +++ lldb/trunk/unittests/tools/lldb-server/CMakeLists.txt Tue May 28 02:29:05 2019 @@ -7,6 +7,7 @@ function(add_lldb_test_executable test_n set_output_directory(${test_name} BINARY_DIR ${outdir} LIBRARY_DIR ${outdir}) list(APPEND ALL_LLDB_TEST_EXECUTABLES ${test_name}) set(ALL_LLDB_TEST_EXECUTABLES ${ALL_LLDB_TEST_EXECUTABLES} PARENT_SCOPE) + set_target_properties(${test_name} PROPERTIES FOLDER "lldb tests") endfunction() add_lldb_test_executable(thread_inferior inferior/thread_inferior.cpp) Modified: lldb/trunk/utils/lit-cpuid/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/utils/lit-cpuid/CMakeLists.txt?rev=361799&r1=361798&r2=361799&view=diff ============================================================================== --- lldb/trunk/utils/lit-cpuid/CMakeLists.txt (original) +++ lldb/trunk/utils/lit-cpuid/CMakeLists.txt Tue May 28 02:29:05 2019 @@ -3,3 +3,4 @@ add_llvm_utility(lit-cpuid ) target_link_libraries(lit-cpuid PRIVATE LLVMSupport) +set_target_properties(lit-cpuid PROPERTIES FOLDER "lldb utils") Modified: lldb/trunk/utils/lldb-dotest/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/utils/lldb-dotest/CMakeLists.txt?rev=361799&r1=361798&r2=361799&view=diff ============================================================================== --- lldb/trunk/utils/lldb-dotest/CMakeLists.txt (original) +++ lldb/trunk/utils/lldb-dotest/CMakeLists.txt Tue May 28 02:29:05 2019 @@ -1,6 +1,7 @@ # Make lldb-dotest a custom target. add_custom_target(lldb-dotest) add_dependencies(lldb-dotest ${LLDB_TEST_DEPS}) +set_target_properties(lldb-dotest PROPERTIES FOLDER "lldb utils") get_property(LLDB_DOTEST_ARGS GLOBAL PROPERTY LLDB_DOTEST_ARGS_PROPERTY) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
