FIXED cdash build name uses the most recent git hash

sdk/cmake/ctest/nightly.cmake

@@ -37,20 +37,6 @@ endif()
 # Compose with those variables the CTest required ones.
 site_name(CTEST_SITE)
 
-# get the git hash
-find_package(Git QUIET)
-if(GIT_FOUND)
-    include("${CTEST_SOURCE_DIRECTORY}/sdk/cmake/modules/macros/GetGitInfo.cmake")
-    set(CMAKE_SOURCE_DIR ${CTEST_SOURCE_DIRECTORY})
-    get_git_info(${CTEST_SOURCE_DIRECTORY})
-    set(CURRENT_GIT_HASH ${CAMITK_GIT_ABBREVIATED_HASH})
-else()
-    set(CURRENT_GIT_HASH "???")
-endif()
-
-# set the build name using the compiler and commit hash
-set(CTEST_BUILD_NAME ${CAMITK_CONTINUOUS_INTEGRATION}-${CURRENT_GIT_HASH})
-
 if(UNIX)
     set( CTEST_CMAKE_GENERATOR  "Unix Makefiles" )
 elseif(WIN32)
@@ -90,23 +76,30 @@ else()
     message(FATAL_ERROR "NO BUILD TYPE : Please provide a build type: Debug or Release")
 endif()
 
+# get the git hash
+find_package(Git QUIET)
+if(GIT_FOUND)
+    include("${CTEST_SOURCE_DIRECTORY}/sdk/cmake/modules/macros/GetGitInfo.cmake")
+else()
+    message(FATAL_ERROR "Git command not found: please install git.")
+endif()
+
 # Update source code and send reports
 set(CTEST_GIT_COMMAND ${GIT_EXECUTABLE})
 
 if(NOT EXISTS "${CTEST_SOURCE_DIRECTORY}")
-  set(CTEST_CHECKOUT_COMMAND "${CTEST_GIT_COMMAND} clone https://forge.imag.fr/anonscm/git/camitk/camitk.git ${CTEST_SOURCE_DIRECTORY}")
+  set(CTEST_CHECKOUT_COMMAND "${GIT_EXECUTABLE} clone https://gricad-gitlab.univ-grenoble-alpes.fr/CamiTK/CamiTK.git ${CTEST_SOURCE_DIRECTORY}")
 endif()
 
-
-set(CTEST_UPDATE_COMMAND ${CTEST_GIT_COMMAND})
+set(CTEST_UPDATE_COMMAND ${GIT_EXECUTABLE})
 
 # CMake configuration (put here all the configure flags)
-set( CTEST_CONFIGURE_COMMAND "${CMAKE_COMMAND} -Wno-dev -G \"${CTEST_CMAKE_GENERATOR}\"")
-set( CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION}")
+set(CTEST_CONFIGURE_COMMAND "${CMAKE_COMMAND} -Wno-dev -G \"${CTEST_CMAKE_GENERATOR}\"")
+set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION}")
 if(COMPILER MATCHES "MSVC2010" AND ARCH MATCHES "64bits") # Do not compile MML and PhysicalModel until libxml2 MSVC2010 x64 bug remains.
     set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DACTION_MML=FALSE -DCOMPONENT_MML=FALSE -DCOMPONENT_PHYSICALMODEL=FALSE")
 endif()
-set( CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DCEP_IMAGING=TRUE -DCEP_MODELING=TRUE -DCEP_TUTORIALS=TRUE -DAPIDOC_SDK=TRUE -DCAMITK_DISABLE_TRANSLATION=TRUE ${CTEST_SOURCE_DIRECTORY}")
+set(CTEST_CONFIGURE_COMMAND "${CTEST_CONFIGURE_COMMAND} -DCEP_IMAGING=TRUE -DCEP_MODELING=TRUE -DCEP_TUTORIALS=TRUE -DAPIDOC_SDK=TRUE -DCAMITK_DISABLE_TRANSLATION=TRUE ${CTEST_SOURCE_DIRECTORY}")
 # -DCAMITK_INSTALL_ROOT=${CTEST_BINARY_DIRECTORY}
 
 # to get CDash server configuration :
@@ -118,6 +111,14 @@ ctest_start(Nightly)
 
 # Update source code
 ctest_update(SOURCE ${CTEST_SOURCE_DIRECTORY} RETURN_VALUE count)
+
+# update revision number
+get_git_info(${CTEST_SOURCE_DIRECTORY})
+set(CURRENT_GIT_HASH ${CAMITK_GIT_ABBREVIATED_HASH})
+
+# set the build name using the compiler and commit hash
+set(CTEST_BUILD_NAME ${CAMITK_CONTINUOUS_INTEGRATION}-${CURRENT_GIT_HASH})
+
 if(count GREATER 0)
     # We only show update when there is change (avoid the CDash u=1 bug with no errors report)
     ctest_submit(PARTS Update Notes)