Skip to content

Commit fbe703a

Browse files
committed
use array
1 parent f96b7bf commit fbe703a

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

.github/workflows/opencvsharp.yml

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,12 @@ jobs:
146146
cat <<'EOS'
147147
set -eux
148148
149-
OpenCV_DIR="${{ github.workspace }}/opencv/lib/cmake/opencv4"
150-
EXTRA_FLAGS=""
149+
EXTRA_FLAGS=()
151150
152151
if [[ "${{ matrix.os }}" =~ ^win ]]; then
153152
OpenCV_DIR="${{ github.workspace }}/opencv/${{ matrix.arch }}/vc17/staticlib"
154153
if [[ "${{ matrix.arch }}" == "x86" ]]; then
155-
EXTRA_FLAGS+=" -A Win32"
154+
EXTRA_FLAGS+=( "-A" "Win32" )
156155
fi
157156
158157
elif [[ "${{ matrix.image }}" =~ ^oraclelinux ]]; then
@@ -162,28 +161,30 @@ jobs:
162161
fi
163162
164163
elif [[ "${{ matrix.os }}" =~ ^alpine ]]; then
165-
EXTRA_FLAGS+=" -DCMAKE_SHARED_LINKER_FLAGS=\"-static-libstdc++\ -static-libgcc\""
164+
EXTRA_FLAGS+=( "-DCMAKE_SHARED_LINKER_FLAGS=-static-libstdc++ -static-libgcc" )
166165
167166
elif [[ ${{ matrix.os }} == "android" ]]; then
168167
OpenCV_DIR="${{ github.workspace }}/opencv/sdk/native/jni"
169-
EXTRA_FLAGS+=" -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake"
170-
EXTRA_FLAGS+=" -DANDROID_PLATFORM=android-24"
171-
EXTRA_FLAGS+=" -DANDROID_STL=c++_static"
168+
EXTRA_FLAGS+=(
169+
"-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK/build/cmake/android.toolchain.cmake"
170+
"-DANDROID_PLATFORM=android-24"
171+
"-DANDROID_STL=c++_static"
172+
)
172173
173174
if [[ "${{ matrix.arch }}" == "arm64" ]]; then
174-
EXTRA_FLAGS+=" -DANDROID_ABI=arm64-v8a"
175+
EXTRA_FLAGS+=( "-DANDROID_ABI=arm64-v8a" )
175176
elif [[ "${{ matrix.arch }}" == "x64" ]]; then
176-
EXTRA_FLAGS+=" -DANDROID_ABI=x86_64"
177+
EXTRA_FLAGS+=( "-DANDROID_ABI=x86_64" )
177178
fi
178179
fi
179180
180181
cd opencvsharp && mkdir build && cd build
181182
cmake \
182183
-D CMAKE_INSTALL_PREFIX="${{ github.workspace }}/opencvsharp/build" \
183184
-D OpenCV_DIR="$OpenCV_DIR" \
184-
$EXTRA_FLAGS \
185+
"${EXTRA_FLAGS[@]}" \
185186
../src
186-
EOS
187+
EOS
187188
)
188189
189190
if [[ "${{ matrix.image }}" == "" ]]; then

0 commit comments

Comments
 (0)