[CMake] NFC. Updating CMake dependency specifications

This patch updates a bunch of places where add_dependencies was being explicitly called to add dependencies on intrinsics_gen to instead use the DEPENDS named parameter. This cleanup is needed for a patch I'm working on to add a dependency debugging mode to the build system.

llvm-svn: 287408
This commit is contained in:
Chris Bieneman 2016-11-18 23:31:53 +00:00
parent 73f03752b6
commit b653c4957d
4 changed files with 26 additions and 14 deletions

View File

@ -23,7 +23,7 @@ macro(add_lldb_library name)
cmake_parse_arguments(PARAM cmake_parse_arguments(PARAM
"MODULE;SHARED;STATIC;OBJECT" "MODULE;SHARED;STATIC;OBJECT"
"" ""
"" "DEPENDS"
${ARGN}) ${ARGN})
llvm_process_sources(srcs ${PARAM_UNPARSED_ARGUMENTS}) llvm_process_sources(srcs ${PARAM_UNPARSED_ARGUMENTS})
@ -61,14 +61,16 @@ macro(add_lldb_library name)
llvm_add_library(${name} ${libkind} ${srcs} LINK_LIBS llvm_add_library(${name} ${libkind} ${srcs} LINK_LIBS
-Wl,--start-group ${LLDB_USED_LIBS} -Wl,--end-group -Wl,--start-group ${LLDB_USED_LIBS} -Wl,--end-group
-Wl,--start-group ${CLANG_USED_LIBS} -Wl,--end-group -Wl,--start-group ${CLANG_USED_LIBS} -Wl,--end-group
DEPENDS ${PARAM_DEPENDS}
) )
else() else()
llvm_add_library(${name} ${libkind} ${srcs} LINK_LIBS llvm_add_library(${name} ${libkind} ${srcs} LINK_LIBS
${LLDB_USED_LIBS} ${CLANG_USED_LIBS} ${LLDB_USED_LIBS} ${CLANG_USED_LIBS}
DEPENDS ${PARAM_DEPENDS}
) )
endif() endif()
else() else()
llvm_add_library(${name} ${libking} ${srcs}) llvm_add_library(${name} ${libkind} ${srcs} DEPENDS ${PARAM_DEPENDS})
endif() endif()
if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "liblldb") if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY OR ${name} STREQUAL "liblldb")

View File

@ -1,3 +1,7 @@
if(NOT LLDB_BUILT_STANDALONE)
set(tablegen_deps intrinsics_gen)
endif()
add_lldb_library(lldbExpression add_lldb_library(lldbExpression
DiagnosticManager.cpp DiagnosticManager.cpp
DWARFExpression.cpp DWARFExpression.cpp
@ -14,8 +18,7 @@ add_lldb_library(lldbExpression
REPL.cpp REPL.cpp
UserExpression.cpp UserExpression.cpp
UtilityFunction.cpp UtilityFunction.cpp
)
if(NOT LLDB_BUILT_STANDALONE) DEPENDS
add_dependencies(lldbExpression intrinsics_gen) ${tablegen_deps}
endif() )

View File

@ -1,3 +1,7 @@
if(NOT LLDB_BUILT_STANDALONE)
set(tablegen_deps intrinsics_gen)
endif()
add_lldb_library(lldbPluginExpressionParserClang add_lldb_library(lldbPluginExpressionParserClang
ASTDumper.cpp ASTDumper.cpp
ASTResultSynthesizer.cpp ASTResultSynthesizer.cpp
@ -12,8 +16,7 @@ add_lldb_library(lldbPluginExpressionParserClang
ClangUserExpression.cpp ClangUserExpression.cpp
ClangUtilityFunction.cpp ClangUtilityFunction.cpp
IRForTarget.cpp IRForTarget.cpp
)
if(NOT LLDB_BUILT_STANDALONE) DEPENDS
add_dependencies(lldbPluginExpressionParserClang intrinsics_gen) ${tablegen_deps}
endif() )

View File

@ -1,10 +1,14 @@
if(NOT LLDB_BUILT_STANDALONE)
set(tablegen_deps intrinsics_gen)
endif()
add_lldb_library(lldbPluginRenderScriptRuntime add_lldb_library(lldbPluginRenderScriptRuntime
RenderScriptRuntime.cpp RenderScriptRuntime.cpp
RenderScriptExpressionOpts.cpp RenderScriptExpressionOpts.cpp
RenderScriptx86ABIFixups.cpp RenderScriptx86ABIFixups.cpp
RenderScriptScriptGroup.cpp RenderScriptScriptGroup.cpp
)
if(NOT LLDB_BUILT_STANDALONE) DEPENDS
add_dependencies(lldbPluginRenderScriptRuntime intrinsics_gen) ${tablegen_deps}
endif() )