File tree Expand file tree Collapse file tree 1 file changed +5
-3
lines changed Expand file tree Collapse file tree 1 file changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -74,8 +74,10 @@ foreach(sdk ${DISPATCH_SDKS})
74
74
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} )
75
75
endif ()
76
76
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 ()
79
81
set (SWIFT_LIBDISPATCH_SYSTEM_PROCESSOR -DCMAKE_SYSTEM_PROCESSOR=${arch} )
80
82
endif ()
81
83
@@ -100,7 +102,7 @@ foreach(sdk ${DISPATCH_SDKS})
100
102
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
101
103
-DCMAKE_SYSTEM_NAME=${SWIFT_SDK_${sdk}_NAME}
102
104
${SWIFT_LIBDISPATCH_SYSTEM_PROCESSOR}
103
- "-DCMAKE_ANDROID_NDK= ${SWIFT_ANDROID_NDK_PATH } "
105
+ "${SWIFT_LIBDISPATCH_ANDROID_NDK } "
104
106
-DCMAKE_ANDROID_ARCH_ABI=${SWIFT_SDK_ANDROID_ARCH_${arch}_ABI}
105
107
-DCMAKE_ANDROID_API=${SWIFT_ANDROID_API_LEVEL}
106
108
-DBUILD_SHARED_LIBS=YES
You can’t perform that action at this time.
0 commit comments