---

yaml
---
r: 349608
b: refs/heads/master-next
c: ec64104
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 930a142c203987a2d83f9f05f50ee06a71f50083
+refs/heads/master-next: ec6410488fef0c7c27e9b1dfcbe2f213a618304e
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/utils/api_checker/CMakeLists.txt

@@ -1,9 +1,29 @@
+set(framework "FrameworkABIBaseline")
 swift_install_in_component(FILES "swift-api-checker.py"
                            DESTINATION "bin"
                            COMPONENT toolchain-tools)
 swift_install_in_component(DIRECTORY "sdk-module-lists"
                            DESTINATION "bin"
                            COMPONENT toolchain-tools)
-swift_install_in_component(DIRECTORY "FrameworkABIBaseline"
+swift_install_in_component(DIRECTORY "${framework}"
                            DESTINATION "lib/swift"
                            COMPONENT toolchain-tools)
+
+# Add symlink of FrameworkABIBaseline to the build dir. This ensures we can
+# find the baseline data from the same relative path as if we are running the
+# checker from the toolchain.
+set(SWIFTLIB_DIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/swift")
+set(dest "${SWIFTLIB_DIR}/${framework}")
+set(source "${CMAKE_CURRENT_SOURCE_DIR}/${framework}")
+
+if(CMAKE_SYSTEM_NAME STREQUAL Windows)
+    set(CMAKE_SYMLINK_COMMAND copy)
+else()
+    set(CMAKE_SYMLINK_COMMAND create_symlink)
+endif()
+add_custom_command(OUTPUT "${dest}"
+                   DEPENDS "${source}"
+                   COMMAND "${CMAKE_COMMAND}" "-E" "${CMAKE_SYMLINK_COMMAND}" "${source}" "${dest}")
+add_custom_target("symlink_abi_checker_data" ALL
+                  DEPENDS "${dest}"
+                  COMMENT "Symlinking ABI checker baseline data to ${dest}")