From: Jonathan Roelofs Date: Tue, 10 Nov 2015 22:48:11 +0000 (+0000) Subject: Implement post-commit review feedback on r252662 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c97f01e89f74b951055f43e5297fadbcef9a462;p=clang Implement post-commit review feedback on r252662 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@252664 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt index b5574dbed0..d6535a1098 100644 --- a/tools/scan-build/CMakeLists.txt +++ b/tools/scan-build/CMakeLists.txt @@ -13,8 +13,8 @@ else() ccc-analyzer c++-analyzer) if (APPLE) - set(BinFiles ${BinFiles} - set-xcode-analyzer) + list(APPEND BinFiles + set-xcode-analyzer) endif() endif() @@ -27,7 +27,6 @@ set(ResourceFiles if(CLANG_INSTALL_SCANBUILD) - set(Depends ) foreach(BinFile ${BinFiles}) add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/bin/${BinFile} COMMAND ${CMAKE_COMMAND} -E make_directory @@ -36,7 +35,7 @@ if(CLANG_INSTALL_SCANBUILD) ${CMAKE_CURRENT_SOURCE_DIR}/${BinFile} ${CMAKE_BINARY_DIR}/bin/ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${BinFile}) - set(Depends ${Depends} ${CMAKE_BINARY_DIR}/bin/${BinFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) install(PROGRAMS ${BinFile} DESTINATION bin) endforeach() @@ -48,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD) ${CMAKE_CURRENT_SOURCE_DIR}/${LibexecFile} ${CMAKE_BINARY_DIR}/libexec/ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${LibexecFile}) - set(Depends ${Depends} ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) install(PROGRAMS ${LibexecFile} DESTINATION libexec) endforeach() @@ -60,7 +59,7 @@ if(CLANG_INSTALL_SCANBUILD) ${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}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/share/man/man1/${ManPage}) install(PROGRAMS ${ManPage} DESTINATION share/man/man1) endforeach() @@ -72,7 +71,7 @@ if(CLANG_INSTALL_SCANBUILD) ${CMAKE_CURRENT_SOURCE_DIR}/${ResourceFile} ${CMAKE_BINARY_DIR}/bin/ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${ResourceFile}) - set(Depends ${Depends} ${CMAKE_BINARY_DIR}/bin/${ResourceFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${ResourceFile}) install(FILES ${ResourceFile} DESTINATION bin) endforeach() diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt index 06840d79e9..d7561f90bd 100644 --- a/tools/scan-view/CMakeLists.txt +++ b/tools/scan-view/CMakeLists.txt @@ -12,7 +12,6 @@ set(ResourceFiles bugcatcher.ico) if(CLANG_INSTALL_SCANVIEW) - set(Depends ) foreach(BinFile ${BinFiles}) add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/bin/${BinFile} COMMAND ${CMAKE_COMMAND} -E make_directory @@ -21,7 +20,7 @@ if(CLANG_INSTALL_SCANVIEW) ${CMAKE_CURRENT_SOURCE_DIR}/${BinFile} ${CMAKE_BINARY_DIR}/bin/ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${BinFile}) - set(Depends ${Depends} ${CMAKE_BINARY_DIR}/bin/${BinFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) install(PROGRAMS ${BinFile} DESTINATION bin) endforeach() @@ -33,7 +32,7 @@ if(CLANG_INSTALL_SCANVIEW) ${CMAKE_CURRENT_SOURCE_DIR}/Resources/${ResourceFile} ${CMAKE_BINARY_DIR}/share/scan-view/ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Resources/${ResourceFile}) - set(Depends ${Depends} ${CMAKE_BINARY_DIR}/share/scan-view/${ResourceFile}) + list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ResourceFile}) install(FILES ${ResourceFile} DESTINATION share/scan-view) endforeach()