]> granicus.if.org Git - clang/commitdiff
[scan-build] Create share directory similar to scan-view's
authorJonathan Roelofs <jonathan@codesourcery.com>
Fri, 13 Nov 2015 00:32:54 +0000 (00:32 +0000)
committerJonathan Roelofs <jonathan@codesourcery.com>
Fri, 13 Nov 2015 00:32:54 +0000 (00:32 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@252981 91177308-0d34-0410-b5e6-96231b3b80d8

tools/scan-build/CMakeLists.txt
tools/scan-build/Makefile
tools/scan-build/share/scanview.css [moved from tools/scan-build/scanview.css with 100% similarity]
tools/scan-build/share/sorttable.js [moved from tools/scan-build/sorttable.js with 100% similarity]

index 7c2df32e0d3f44b80b5237cac1645661ac398432..3564c89732b194c5056ffa5e063c063e737deb29 100644 (file)
@@ -21,7 +21,7 @@ endif()
 set(ManPages
       scan-build.1)
 
-set(ResourceFiles
+set(ShareFiles
       scanview.css
       sorttable.js)
 
@@ -63,16 +63,16 @@ if(CLANG_INSTALL_SCANBUILD)
     install(PROGRAMS ${ManPage} DESTINATION share/man/man1)
   endforeach()
 
-  foreach(ResourceFile ${ResourceFiles})
-    add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/bin/${ResourceFile}
+  foreach(ShareFile ${ShareFiles})
+    add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}
                        COMMAND ${CMAKE_COMMAND} -E make_directory
-                         ${CMAKE_BINARY_DIR}/bin
+                         ${CMAKE_BINARY_DIR}/share/scan-view
                        COMMAND ${CMAKE_COMMAND} -E copy
-                         ${CMAKE_CURRENT_SOURCE_DIR}/${ResourceFile}
-                         ${CMAKE_BINARY_DIR}/bin/
-                       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${ResourceFile})
-    list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${ResourceFile})
-    install(FILES ${ResourceFile} DESTINATION bin)
+                         ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}
+                         ${CMAKE_BINARY_DIR}/share/scan-view/
+                       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile})
+    list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile})
+    install(FILES ${ShareFile} DESTINATION share/scan-view)
   endforeach()
 
   add_custom_target(scan-build ALL DEPENDS ${Depends})
index a6a2c10ce08099a6c9ca28ede431174bbe46d6dd..a9e072aa3c633b741c6e744ddb271197df3c93d8 100644 (file)
@@ -47,7 +47,7 @@ $(ShareDir)/man/man1/%: % Makefile $(ShareDir)/man/man1/.dir
        $(Echo) "Copying $(notdir $<) to the 'share' directory..."
        $(Verb)cp $< $@
 
-$(ShareDir)/scan-build/%: % Makefile $(ShareDir)/scan-build/.dir
+$(ShareDir)/scan-build/%: share/% Makefile $(ShareDir)/scan-build/.dir
        $(Echo) "Copying $(notdir $<) to the 'share' directory..."
        $(Verb)cp $< $@