Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

utils/CMakeLists.txt

@@ -6,12 +6,12 @@ swift_install_in_component(FILES swift-mode.el
                            DESTINATION "share/emacs/site-lisp"
                            COMPONENT editor-integration)
 
-swift_install_in_component(FILES swift-api-dump.py
+swift_install_in_component(PROGRAMS swift-api-dump.py
                            DESTINATION bin
                            COMPONENT tools)
 
 # We install LLVM's FileCheck, if requested.
 file(TO_CMAKE_PATH "${LLVM_BUILD_BINARY_DIR}/bin/FileCheck${CMAKE_EXECUTABLE_SUFFIX}" _SWIFT_UTILS_FILECHECK)
-swift_install_in_component(FILES "${_SWIFT_UTILS_FILECHECK}"
+swift_install_in_component(PROGRAMS "${_SWIFT_UTILS_FILECHECK}"
                            DESTINATION bin
                            COMPONENT toolchain-dev-tools)