diff --git a/CI/main_superbuild.cmake b/CI/main_superbuild.cmake index 9de466dd0f562541fa9aa2a3ed32dd44cd217c95..b6e1c925c53080aca39896650648aaf3d87622c4 100644 --- a/CI/main_superbuild.cmake +++ b/CI/main_superbuild.cmake @@ -44,7 +44,12 @@ file(READ "${OTB_SOURCE_DIR}/sb_branch.txt" BRANCH_NAME) ############################################################################### set ( REMOTE "https://gitlab.orfeo-toolbox.org/gbonnefille/superbuild-artifact.git") # set ( BRANCH_NAME "${IMAGE_NAME}/${SB_MD5}") -set( GIT "git" ) + +# Look for a GIT command-line client. +find_program(CTEST_GIT_COMMAND NAMES git git.cmd) + +# FIXME: Replace ${GIT} variable with $[CTEST_GIT_COMMAND}" +set( GIT "${CTEST_GIT_COMMAND}" ) execute_process( COMMAND ${GIT} "clone" "${REMOTE}" "--branch" "${BRANCH_NAME}" diff --git a/CI/prepare_superbuild.cmake b/CI/prepare_superbuild.cmake index 13bbe39ce4fb571c80b01d780a7158b1e341ddb7..95f4ed3035573d85c05f05c81bcd45b31f387908 100644 --- a/CI/prepare_superbuild.cmake +++ b/CI/prepare_superbuild.cmake @@ -122,7 +122,13 @@ file ( WRITE "${OTB_SOURCE_DIR}/sb_branch.txt" "${IMAGE_NAME}/${SB_MD5}") message( "Checking out git for existence of archive") set ( REMOTE "https://gitlab.orfeo-toolbox.org/gbonnefille/superbuild-artifact/") set ( BRANCH_NAME "${IMAGE_NAME}/${SB_MD5}") + +# Look for a GIT command-line client. +find_program(CTEST_GIT_COMMAND NAMES git git.cmd) + +# FIXME: Replace ${GIT} variable with $[CTEST_GIT_COMMAND}" set( GIT "git" ) + execute_process( COMMAND ${GIT} "ls-remote" "${REMOTE}" "${BRANCH_NAME}" OUTPUT_VARIABLE IS_SB_BUILD