diff options
| -rw-r--r-- | clang/tools/scan-build/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | clang/tools/scan-build/Makefile | 2 | ||||
| -rw-r--r-- | clang/tools/scan-build/share/scanview.css (renamed from clang/tools/scan-build/scanview.css) | 0 | ||||
| -rw-r--r-- | clang/tools/scan-build/share/sorttable.js (renamed from clang/tools/scan-build/sorttable.js) | 0 |
4 files changed, 10 insertions, 10 deletions
diff --git a/clang/tools/scan-build/CMakeLists.txt b/clang/tools/scan-build/CMakeLists.txt index 7c2df32e0d3..3564c89732b 100644 --- a/clang/tools/scan-build/CMakeLists.txt +++ b/clang/tools/scan-build/CMakeLists.txt @@ -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}) diff --git a/clang/tools/scan-build/Makefile b/clang/tools/scan-build/Makefile index a6a2c10ce08..a9e072aa3c6 100644 --- a/clang/tools/scan-build/Makefile +++ b/clang/tools/scan-build/Makefile @@ -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 $< $@ diff --git a/clang/tools/scan-build/scanview.css b/clang/tools/scan-build/share/scanview.css index cf8a5a6ad47..cf8a5a6ad47 100644 --- a/clang/tools/scan-build/scanview.css +++ b/clang/tools/scan-build/share/scanview.css diff --git a/clang/tools/scan-build/sorttable.js b/clang/tools/scan-build/share/sorttable.js index 32faa078d89..32faa078d89 100644 --- a/clang/tools/scan-build/sorttable.js +++ b/clang/tools/scan-build/share/sorttable.js |
