Skip to content

Commit 94dfea8

Browse files
authored
GH-951: Fix CI completely, especially JNI on Windows 2022 and MacOS platforms (#925)
This fixes #951
1 parent b9e40fa commit 94dfea8

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

ci/scripts/jni_macos_build.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@ cmake \
7777
cmake --build "${build_dir}/cpp" --target install
7878
github_actions_group_end
7979

80-
export JAVA_JNI_CMAKE_ARGS="-DProtobuf_ROOT=${build_dir}/cpp/protobuf_ep-install"
80+
JAVA_JNI_CMAKE_ARGS="-DProtobuf_ROOT=${build_dir}/cpp/_deps/protobuf-build"
81+
JAVA_JNI_CMAKE_ARGS+=" -DProtobuf_SRC_ROOT_FOLDER=${build_dir}/cpp/_deps/protobuf-src"
82+
export JAVA_JNI_CMAKE_ARGS
8183
"${source_dir}/ci/scripts/jni_build.sh" \
8284
"${source_dir}" \
8385
"${install_dir}" \

0 commit comments

Comments
 (0)