diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt
index 9a50b4cb0d02..64807daa7954 100644
--- a/lldb/CMakeLists.txt
+++ b/lldb/CMakeLists.txt
@@ -133,7 +133,8 @@ if(LLDB_INCLUDE_TESTS)
     list(APPEND LLDB_TEST_DEPS dsymutil)
   endif()
 
-  add_custom_target(lldb-test-deps DEPENDS ${LLDB_TEST_DEPS})
+  add_custom_target(lldb-test-deps)
+  add_dependencies(lldb-test-deps ${LLDB_TEST_DEPS})
 
   add_subdirectory(test)
   add_subdirectory(unittests)
diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake
index 9505034ce752..3e82200f2065 100644
--- a/lldb/cmake/modules/AddLLDB.cmake
+++ b/lldb/cmake/modules/AddLLDB.cmake
@@ -83,7 +83,7 @@ function(add_lldb_library name)
       endif()
       if (NOT CMAKE_CONFIGURATION_TYPES)
         add_llvm_install_targets(install-${name}
-                                 DEPENDS $<TARGET_FILE:${name}>
+                                 DEPENDS ${name}
                                  COMPONENT ${name})
       endif()
     endif()
diff --git a/lldb/docs/CMakeLists.txt b/lldb/docs/CMakeLists.txt
index 8051d476e0bc..94d4523b84c2 100644
--- a/lldb/docs/CMakeLists.txt
+++ b/lldb/docs/CMakeLists.txt
@@ -32,8 +32,8 @@ if(EPYDOC_EXECUTABLE)
   get_target_property(lldb_scripts_dir swig_wrapper BINARY_DIR)
   add_custom_target(lldb-python-doc-package
     COMMAND "${CMAKE_COMMAND}" -E copy "${lldb_scripts_dir}/lldb.py" "${CMAKE_CURRENT_BINARY_DIR}/lldb/__init__.py"
-    DEPENDS swig_wrapper
     COMMENT "Copying lldb.py to pretend package.")
+  add_dependencies(lldb-python-doc-package swig_wrapper)
 
   set(DOC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/doc")
   file(MAKE_DIRECTORY "${DOC_DIR}")
@@ -45,11 +45,10 @@ if(EPYDOC_EXECUTABLE)
     --name "LLDB python API"
     --url "http://lldb.llvm.org"
     ${EPYDOC_OPTIONS}
-    DEPENDS swig_wrapper
-    DEPENDS lldb-python-doc-package
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Generating LLDB Python API reference with epydoc" VERBATIM
   )
+  add_dependencies(lldb-python-doc swig_wrapper lldb-python-doc-package)
 else()
   message(STATUS "Could NOT find epydoc")
 endif()
diff --git a/lldb/test/CMakeLists.txt b/lldb/test/CMakeLists.txt
index 72f1c234b294..ea9ba2e80089 100644
--- a/lldb/test/CMakeLists.txt
+++ b/lldb/test/CMakeLists.txt
@@ -8,9 +8,9 @@ function(add_python_test_target name test_script args comment)
   add_custom_target(${name}
     COMMAND ${PYTHON_TEST_COMMAND} ${ARG_DEFAULT_ARGS}
     COMMENT "${comment}"
-    DEPENDS ${LLDB_TEST_DEPS}
     USES_TERMINAL
     )
+  add_dependencies(${name} ${LLDB_TEST_DEPS})
 endfunction()
 
 # The default architecture with which to compile test executables is the default LLVM target