r252489 - Fix the cmake build after r252474 broke it

Jonathan Roelofs via cfe-commits cfe-commits at lists.llvm.org
Mon Nov 9 08:47:09 PST 2015


Author: jroelofs
Date: Mon Nov  9 10:47:09 2015
New Revision: 252489

URL: http://llvm.org/viewvc/llvm-project?rev=252489&view=rev
Log:
Fix the cmake build after r252474 broke it

Modified:
    cfe/trunk/tools/scan-build/CMakeLists.txt
    cfe/trunk/tools/scan-view/CMakeLists.txt

Modified: cfe/trunk/tools/scan-build/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/scan-build/CMakeLists.txt?rev=252489&r1=252488&r2=252489&view=diff
==============================================================================
--- cfe/trunk/tools/scan-build/CMakeLists.txt (original)
+++ cfe/trunk/tools/scan-build/CMakeLists.txt Mon Nov  9 10:47:09 2015
@@ -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})

Modified: cfe/trunk/tools/scan-view/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/scan-view/CMakeLists.txt?rev=252489&r1=252488&r2=252489&view=diff
==============================================================================
--- cfe/trunk/tools/scan-view/CMakeLists.txt (original)
+++ cfe/trunk/tools/scan-view/CMakeLists.txt Mon Nov  9 10:47:09 2015
@@ -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()




More information about the cfe-commits mailing list