From: Jonathan Roelofs Date: Mon, 9 Nov 2015 16:47:09 +0000 (+0000) Subject: Fix the cmake build after r252474 broke it X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02f36bd65b1133fbfa8bf1470105c02d9bda35e7;p=clang Fix the cmake build after r252474 broke it git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@252489 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/tools/scan-build/CMakeLists.txt b/tools/scan-build/CMakeLists.txt index 0f7753d861..8a792019fb 100644 --- a/tools/scan-build/CMakeLists.txt +++ b/tools/scan-build/CMakeLists.txt @@ -56,7 +56,7 @@ if(CLANG_INSTALL_SCANBUILD) COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${ManPage} ${CMAKE_BINARY_DIR}/share/man/man1/) - install(PROGRAMS scan-build.1 DESTINATION share/man/man1) + install(PROGRAMS ${ManPage} DESTINATION share/man/man1) endforeach() foreach(ResourceFile ${ResourceFiles}) diff --git a/tools/scan-view/CMakeLists.txt b/tools/scan-view/CMakeLists.txt index bfff39d11f..8f51fd484f 100644 --- a/tools/scan-view/CMakeLists.txt +++ b/tools/scan-view/CMakeLists.txt @@ -8,7 +8,10 @@ set(BinFiles scan-view startfile.py) -file(GLOB ResourceFiles Resources/*) +set(ResourceFiles + Resources/FileRadar.scpt + Resources/GetRadarVersion.scpt + Resources/bugcatcher.ico) if(CLANG_INSTALL_SCANVIEW) foreach(BinFile ${BinFiles}) @@ -26,7 +29,7 @@ if(CLANG_INSTALL_SCANVIEW) COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/share/scan-view COMMAND ${CMAKE_COMMAND} -E copy - ${ResourceFile} + ${CMAKE_CURRENT_SOURCE_DIR}/${ResourceFile} ${CMAKE_BINARY_DIR}/share/scan-view/) install(FILES ${ResourceFile} DESTINATION share/scan-view) endforeach()