commit b5918c11f63e42b272861573aff73c1c01dd0d53
author Saleem Abdulrasool <compnerd@compnerd.org> Wed Jun 13 21:01:58 2018 -0700
committer GitHub <noreply@github.com> Wed Jun 13 21:01:58 2018 -0700
tree 382e891210e2a1545a62a96e9ffb7ad70d49dc81
parent 70118c335fb6275f596ed00a093efdcc90586678
parent bea14cfdcfcec21b498bf9916557f043c41b22e5

Merge pull request #215 from compnerd/compatibility

build: add compatibility with the build_script.py build

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a50a635..0630a2c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,9 @@
                   LINK_FLAGS
                     -L${XCTEST_PATH_TO_LIBDISPATCH_BUILD}/src -ldispatch
                     -L${XCTEST_PATH_TO_FOUNDATION_BUILD} -lFoundation
+
+                    # compatibility with Foundation build_script.py
+                    -L${XCTEST_PATH_TO_FOUNDATION_BUILD}/Foundation
                   SOURCES
                     Sources/XCTest/Private/WallClockTimeMetric.swift
                     Sources/XCTest/Private/TestListing.swift
@@ -85,7 +88,11 @@
                     -Xcc -fblocks
 
                     -I${XCTEST_PATH_TO_FOUNDATION_BUILD}/swift
-                    -Fsystem ${XCTEST_PATH_TO_COREFOUNDATION_BUILD}/System/Library/Frameworks)
+                    -Fsystem ${XCTEST_PATH_TO_COREFOUNDATION_BUILD}/System/Library/Frameworks
+
+                    # compatibility with Foundation build_script.py
+                    -I${XCTEST_PATH_TO_FOUNDATION_BUILD}/Foundation
+                    -I${XCTEST_PATH_TO_FOUNDATION_BUILD}/Foundation/usr/lib/swift)
 
 if(EXISTS ${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py)
   set(LIT_COMMAND "${PYTHON_EXECUTABLE};${LLVM_MAIN_SRC_DIR}/utils/lit/lit.py"