Implement the fix that r252641 should have been

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@252662 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt
index f3d8022bfba380c781cdaa636a0db62305df4676..b5574dbed07d5f3fee3dff705614d0897d4d5ee1 100644 (file)
--- a/tools/scan-build/CMakeLists.txt
+++ b/tools/scan-build/CMakeLists.txt
@@ -1,5 +1,3 @@
-add_custom_target(scan-build ALL)
-
 option(CLANG_INSTALL_SCANBUILD "Install the scan-build tool" ON)
 
 if (WIN32 AND NOT CYGWIN)
@@ -29,47 +27,55 @@ set(ResourceFiles
 
 
 if(CLANG_INSTALL_SCANBUILD)
+  set(Depends )
   foreach(BinFile ${BinFiles})
-    add_custom_command(TARGET scan-build PRE_BUILD
+    add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/bin/${BinFile}
                        COMMAND ${CMAKE_COMMAND} -E make_directory
                          ${CMAKE_BINARY_DIR}/bin
                        COMMAND ${CMAKE_COMMAND} -E copy
                          ${CMAKE_CURRENT_SOURCE_DIR}/${BinFile}
                          ${CMAKE_BINARY_DIR}/bin/
                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${BinFile})
+    set(Depends ${Depends}  ${CMAKE_BINARY_DIR}/bin/${BinFile})
     install(PROGRAMS ${BinFile} DESTINATION bin)
   endforeach()
 
   foreach(LibexecFile ${LibexecFiles})
-    add_custom_command(TARGET scan-build PRE_BUILD
+    add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}
                        COMMAND ${CMAKE_COMMAND} -E make_directory
                          ${CMAKE_BINARY_DIR}/libexec
                        COMMAND ${CMAKE_COMMAND} -E copy
                          ${CMAKE_CURRENT_SOURCE_DIR}/${LibexecFile}
                          ${CMAKE_BINARY_DIR}/libexec/
                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${LibexecFile})
+    set(Depends ${Depends} ${CMAKE_BINARY_DIR}/libexec/${LibexecFile})
     install(PROGRAMS ${LibexecFile} DESTINATION libexec)
   endforeach()
 
   foreach(ManPage ${ManPages})
-    add_custom_command(TARGET scan-build PRE_BUILD
+    add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/share/man/man1/${ManPage}
                        COMMAND ${CMAKE_COMMAND} -E make_directory
                          ${CMAKE_BINARY_DIR}/share/man/man1
                        COMMAND ${CMAKE_COMMAND} -E copy
                          ${CMAKE_CURRENT_SOURCE_DIR}/${ManPage}
                          ${CMAKE_BINARY_DIR}/share/man/man1/
                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${ManPage})
+    set(Depends ${Depends} ${CMAKE_BINARY_DIR}/share/man/man1/${ManPage})
     install(PROGRAMS ${ManPage} DESTINATION share/man/man1)
   endforeach()
 
   foreach(ResourceFile ${ResourceFiles})
-    add_custom_command(TARGET scan-build PRE_BUILD
+    add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/bin/${ResourceFile}
                        COMMAND ${CMAKE_COMMAND} -E make_directory
                          ${CMAKE_BINARY_DIR}/bin
                        COMMAND ${CMAKE_COMMAND} -E copy
                          ${CMAKE_CURRENT_SOURCE_DIR}/${ResourceFile}
                          ${CMAKE_BINARY_DIR}/bin/
                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${ResourceFile})
+    set(Depends ${Depends} ${CMAKE_BINARY_DIR}/bin/${ResourceFile})
     install(FILES ${ResourceFile} DESTINATION bin)
   endforeach()
+
+  add_custom_target(scan-build ALL DEPENDS ${Depends})
 endif()
+

diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt
index 0f361b2c7be0542dac48cf8a50c6762a52070751..06840d79e947bda4eeb6a0f5283046497f4e4e42 100644 (file)
--- a/tools/scan-view/CMakeLists.txt
+++ b/tools/scan-view/CMakeLists.txt
@@ -1,5 +1,3 @@
-add_custom_target(scan-view ALL)
-
 option(CLANG_INSTALL_SCANVIEW "Install the scan-view tool" ON)
 
 set(BinFiles
@@ -9,30 +7,35 @@ set(BinFiles
       startfile.py)
 
 set(ResourceFiles
-      Resources/FileRadar.scpt
-      Resources/GetRadarVersion.scpt
-      Resources/bugcatcher.ico)
+      FileRadar.scpt
+      GetRadarVersion.scpt
+      bugcatcher.ico)
 
 if(CLANG_INSTALL_SCANVIEW)
+  set(Depends )
   foreach(BinFile ${BinFiles})
-    add_custom_command(TARGET scan-view PRE_BUILD
+    add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/bin/${BinFile}
                        COMMAND ${CMAKE_COMMAND} -E make_directory
                          ${CMAKE_BINARY_DIR}/bin
                        COMMAND ${CMAKE_COMMAND} -E copy
                          ${CMAKE_CURRENT_SOURCE_DIR}/${BinFile}
                          ${CMAKE_BINARY_DIR}/bin/
                        DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${BinFile})
+    set(Depends ${Depends} ${CMAKE_BINARY_DIR}/bin/${BinFile})
     install(PROGRAMS ${BinFile} DESTINATION bin)
   endforeach()
 
   foreach(ResourceFile ${ResourceFiles})
-    add_custom_command(TARGET scan-view PRE_BUILD
+    add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/share/scan-view/${ResourceFile}
                        COMMAND ${CMAKE_COMMAND} -E make_directory
                          ${CMAKE_BINARY_DIR}/share/scan-view
                        COMMAND ${CMAKE_COMMAND} -E copy
-                         ${CMAKE_CURRENT_SOURCE_DIR}/${ResourceFile}
+                         ${CMAKE_CURRENT_SOURCE_DIR}/Resources/${ResourceFile}
                          ${CMAKE_BINARY_DIR}/share/scan-view/
-                       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${ResourceFile})
+                       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Resources/${ResourceFile})
+    set(Depends ${Depends} ${CMAKE_BINARY_DIR}/share/scan-view/${ResourceFile})
     install(FILES ${ResourceFile} DESTINATION share/scan-view)
   endforeach()
+
+  add_custom_target(scan-view ALL DEPENDS ${Depends})
 endif()