Skip to content

Commit cb3d578

Browse files
committed
build: convert NDK path on Windows
Convert the NDK path to allow the native path to be used when configuring the Swift runtime but use the CMake spelling when performing the inner configure.
1 parent 11dd84e commit cb3d578

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

cmake/modules/Libdispatch.cmake

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,10 @@ foreach(sdk ${DISPATCH_SDKS})
7474
set(SWIFT_LIBDISPATCH_COMPILER_TRIPLE_CMAKE_ARGS -DCMAKE_C_COMPILER_TARGET=${SWIFT_SDK_WINDOWS_ARCH_${arch}_TRIPLE};-DCMAKE_CXX_COMPILER_TARGET=${SWIFT_SDK_WINDOWS_ARCH_${arch}_TRIPLE})
7575
endif()
7676

77-
78-
if(NOT sdk STREQUAL ANDROID)
77+
if("${sdk}" STREQUAL "ANDROID")
78+
file(TO_CMAKE_PATH "${SWIFT_ANDROID_NDK_PATH}" _ANDROID_NDK)
79+
set(SWIFT_LIBDISPATCH_ANDROID_NDK -DCMAKE_ANDROID_NDK=${_ANDROID_NDK})
80+
else()
7981
set(SWIFT_LIBDISPATCH_SYSTEM_PROCESSOR -DCMAKE_SYSTEM_PROCESSOR=${arch})
8082
endif()
8183

@@ -100,7 +102,7 @@ foreach(sdk ${DISPATCH_SDKS})
100102
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
101103
-DCMAKE_SYSTEM_NAME=${SWIFT_SDK_${sdk}_NAME}
102104
${SWIFT_LIBDISPATCH_SYSTEM_PROCESSOR}
103-
"-DCMAKE_ANDROID_NDK=${SWIFT_ANDROID_NDK_PATH}"
105+
"${SWIFT_LIBDISPATCH_ANDROID_NDK}"
104106
-DCMAKE_ANDROID_ARCH_ABI=${SWIFT_SDK_ANDROID_ARCH_${arch}_ABI}
105107
-DCMAKE_ANDROID_API=${SWIFT_ANDROID_API_LEVEL}
106108
-DBUILD_SHARED_LIBS=YES

0 commit comments

Comments
 (0)