diff options
4 files changed, 26 insertions, 14 deletions
diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake index af678670629..09952b1297c 100644 --- a/lldb/cmake/modules/AddLLDB.cmake +++ b/lldb/cmake/modules/AddLLDB.cmake @@ -23,7 +23,7 @@ macro(add_lldb_library name) cmake_parse_arguments(PARAM "MODULE;SHARED;STATIC;OBJECT" "" - "" + "DEPENDS" ${ARGN}) llvm_process_sources(srcs ${PARAM_UNPARSED_ARGUMENTS}) @@ -61,14 +61,16 @@ macro(add_lldb_library name) llvm_add_library(${name} ${libkind} ${srcs} LINK_LIBS -Wl,--start-group ${LLDB_USED_LIBS} -Wl,--end-group -Wl,--start-group ${CLANG_USED_LIBS} -Wl,--end-group + DEPENDS ${PARAM_DEPENDS} ) else() llvm_add_library(${name} ${libkind} ${srcs} LINK_LIBS ${LLDB_USED_LIBS} ${CLANG_USED_LIBS} + DEPENDS ${PARAM_DEPENDS} ) endif() else() - llvm_add_library(${name} ${libking} ${srcs}) + llvm_add_library(${name} ${libkind} ${srcs} DEPENDS ${PARAM_DEPENDS}) endif() if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "liblldb") diff --git a/lldb/source/Expression/CMakeLists.txt b/lldb/source/Expression/CMakeLists.txt index 660fccbf41c..f8faa6df026 100644 --- a/lldb/source/Expression/CMakeLists.txt +++ b/lldb/source/Expression/CMakeLists.txt @@ -1,3 +1,7 @@ +if(NOT LLDB_BUILT_STANDALONE) + set(tablegen_deps intrinsics_gen) +endif() + add_lldb_library(lldbExpression DiagnosticManager.cpp DWARFExpression.cpp @@ -14,8 +18,7 @@ add_lldb_library(lldbExpression REPL.cpp UserExpression.cpp UtilityFunction.cpp - ) -if(NOT LLDB_BUILT_STANDALONE) - add_dependencies(lldbExpression intrinsics_gen) -endif() + DEPENDS + ${tablegen_deps} + ) diff --git a/lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt b/lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt index 3bdbf3b2c0e..64559d20bb4 100644 --- a/lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt +++ b/lldb/source/Plugins/ExpressionParser/Clang/CMakeLists.txt @@ -1,3 +1,7 @@ +if(NOT LLDB_BUILT_STANDALONE) + set(tablegen_deps intrinsics_gen) +endif() + add_lldb_library(lldbPluginExpressionParserClang ASTDumper.cpp ASTResultSynthesizer.cpp @@ -12,8 +16,7 @@ add_lldb_library(lldbPluginExpressionParserClang ClangUserExpression.cpp ClangUtilityFunction.cpp IRForTarget.cpp - ) -if(NOT LLDB_BUILT_STANDALONE) - add_dependencies(lldbPluginExpressionParserClang intrinsics_gen) -endif() + DEPENDS + ${tablegen_deps} + ) diff --git a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/CMakeLists.txt b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/CMakeLists.txt index 0b19dba5ab6..cd08f14137d 100644 --- a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/CMakeLists.txt +++ b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/CMakeLists.txt @@ -1,10 +1,14 @@ +if(NOT LLDB_BUILT_STANDALONE) + set(tablegen_deps intrinsics_gen) +endif() + + add_lldb_library(lldbPluginRenderScriptRuntime RenderScriptRuntime.cpp RenderScriptExpressionOpts.cpp RenderScriptx86ABIFixups.cpp RenderScriptScriptGroup.cpp - ) -if(NOT LLDB_BUILT_STANDALONE) - add_dependencies(lldbPluginRenderScriptRuntime intrinsics_gen) -endif() + DEPENDS + ${tablegen_deps} + ) |
