Skip to content

Commit

Permalink
ci: Quick-fix ci_verify_cmake.sh
Browse files Browse the repository at this point in the history
Avoid using `cmake --option=value` and `ctest --option=value`, to stay
compatible with older versions of CMake.
  • Loading branch information
ctruta committed Oct 18, 2023
1 parent f79c85e commit e755fb7
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions ci/ci_verify_cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -145,25 +145,25 @@ function ci_build {
"$CI_BUILD_TO_SRC_RELDIR"
# Spawn "cmake --build ...".
ci_spawn "$CI_CMAKE" --build . \
--config="$CI_CMAKE_BUILD_TYPE" \
--config "$CI_CMAKE_BUILD_TYPE" \
"${ALL_CMAKE_BUILD_FLAGS[@]}"
ci_expr $((CI_NO_TEST)) || {
# Spawn "ctest" if testing is not disabled.
ci_spawn "$CI_CTEST" --build-config="$CI_CMAKE_BUILD_TYPE" \
ci_spawn "$CI_CTEST" --build-config "$CI_CMAKE_BUILD_TYPE" \
"${ALL_CTEST_FLAGS[@]}"
}
ci_expr $((CI_NO_INSTALL)) || {
# Spawn "cmake --build ... --target=install" if installation is not disabled.
# Spawn "cmake --build ... --target install" if installation is not disabled.
ci_spawn "$CI_CMAKE" --build . \
--config="$CI_CMAKE_BUILD_TYPE" \
--target=install \
--config "$CI_CMAKE_BUILD_TYPE" \
--target install \
"${ALL_CMAKE_BUILD_FLAGS[@]}"
}
ci_expr $((CI_NO_CLEAN)) || {
# Spawn "make --build ... --target=clean" if cleaning is not disabled.
# Spawn "make --build ... --target clean" if cleaning is not disabled.
ci_spawn "$CI_CMAKE" --build . \
--config="$CI_CMAKE_BUILD_TYPE" \
--target=clean \
--config "$CI_CMAKE_BUILD_TYPE" \
--target clean \
"${ALL_CMAKE_BUILD_FLAGS[@]}"
}
ci_info "## END OF BUILD ##"
Expand Down

0 comments on commit e755fb7

Please sign in to comment.