Skip to content

Commit 6ff321a

Browse files
committed
build: adjust cmake invocation for export targets
This adjusts the cmake invocation for Foundation to use the export targets rather than computing the locations by hand.
1 parent a27521d commit 6ff321a

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

utils/build-script-impl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2916,6 +2916,7 @@ for host in "${ALL_HOSTS[@]}"; do
29162916
LIBDISPATCH_BUILD_ARGS=(
29172917
-DFOUNDATION_PATH_TO_LIBDISPATCH_SOURCE=${LIBDISPATCH_SOURCE_DIR}
29182918
-DFOUNDATION_PATH_TO_LIBDISPATCH_BUILD=${LIBDISPATCH_BUILD_DIR}
2919+
-Ddispatch_DIR=${LIBDISPATCH_BUILD_DIR}/cmake/modules
29192920
)
29202921
else
29212922
LIBDISPATCH_BUILD_ARGS=( -DFOUNDATION_ENABLE_LIBDISPATCH=NO )
@@ -2924,20 +2925,22 @@ for host in "${ALL_HOSTS[@]}"; do
29242925
SWIFTC_BIN="$(build_directory_bin ${LOCAL_HOST} swift)/swiftc"
29252926
LLVM_BIN="$(build_directory_bin ${LOCAL_HOST} llvm)"
29262927

2928+
# NOTE(compnerd) the time has come to enable tests now
29272929
cmake_options=(
29282930
${cmake_options[@]}
29292931
-DCMAKE_BUILD_TYPE:STRING=${FOUNDATION_BUILD_TYPE}
29302932
-DCMAKE_C_COMPILER:PATH=${LLVM_BIN}/clang
29312933
-DCMAKE_CXX_COMPILER:PATH=${LLVM_BIN}/clang++
2932-
-DCMAKE_SWIFT_COMPILER:PATH=${SWIFTC_BIN}
29332934
-DCMAKE_Swift_COMPILER:PATH=${SWIFTC_BIN}
29342935
-DCMAKE_INSTALL_PREFIX:PATH=$(get_host_install_prefix ${host})
29352936

29362937
${LIBICU_BUILD_ARGS[@]}
29372938
${LIBDISPATCH_BUILD_ARGS[@]}
29382939

2939-
# NOTE(compnerd) the time has come to enable tests now
29402940
-DENABLE_TESTING:BOOL=YES
2941+
-DXCTest_DIR=$(build_directory ${host} xctest)/cmake/modules
2942+
2943+
-DCMAKE_SWIFT_COMPILER:PATH=${SWIFTC_BIN}
29412944
-DFOUNDATION_PATH_TO_XCTEST_BUILD:PATH=$(build_directory ${host} xctest)
29422945
)
29432946

0 commit comments

Comments
 (0)