FIXED improved CamiTK version information

sdk/SDKConfig.cmake

@@ -31,14 +31,16 @@ if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/libraries/core/CamiTKVersion.h)
         # the svn command itself
         include(cmake/modules/macros/GetGitInfo.cmake)
         get_git_info(${CMAKE_CURRENT_SOURCE_DIR})
-        set(CAMITK_VERSION_GIT ".${CAMITK_GIT_COMMIT_COUNT}")
-        set(CAMITK_SVN_SUBVERSION_FOUND "1")
+        set(CAMITK_VERSION_GIT ".${CAMITK_GIT_BRANCH}.${CAMITK_GIT_ABBREVIATED_HASH}")
+        set(CAMITK_GIT_FOUND "1")
+        set(CAMITK_GIT_HASH "${CAMITK_GIT_HASH}")
+        set(CAMITK_GIT_DATE "${CAMITK_GIT_COMMITER_DATE}")
     else()
         set(CAMITK_VERSION_GIT ".git")
-        set(CAMITK_SVN_SUBVERSION_FOUND "0")
+        set(CAMITK_GIT_FOUND "0")
     endif()    
 else()
-    set(CAMITK_SVN_SUBVERSION_FOUND "0")
+    set(CAMITK_GIT_FOUND "0")
     set(CAMITK_SOURCE_PACKAGE_VERSION "1")
 endif()
 

sdk/applications/config/CamiTKVersionInformation.h.in

@@ -28,18 +28,18 @@ bool compiledFromPackageSource() {
     return @CAMITK_SOURCE_PACKAGE_VERSION@;
 }
 
-/// if the SDK is compiled from the svn version, this function returns if more svn information are available
-bool hasMoreSvnInformation() {
-    return @CAMITK_SVN_SUBVERSION_FOUND@;
+/// if the SDK is compiled from the git version, this function returns if more git information are available
+bool hasMoreGitInformation() {
+    return @CAMITK_GIT_FOUND@;
 }
 
-/// if the SDK is compiled from the svn version, this function returns the svn revision
-std::string svnRevision() {
-    return "@CAMITK_SVN_WC_REVISION@";
+/// if the SDK is compiled from the git version, this function returns the git complete hash
+std::string gitHash() {
+    return "@CAMITK_GIT_HASH@";
 }
 
-/// if the SDK is compiled from the svn version, this function returns the date of the last modified SDK file (YYYY-MM-DD HH:MM:SS)
-std::string svnDate() {
-    return "@CAMITK_SVN_DATE@";
+/// if the SDK is compiled from the git version, this function returns the last commit date
+std::string gitDate() {
+    return "@CAMITK_GIT_DATE@";
 }
     
\ No newline at end of file

sdk/applications/config/main.cpp

@@ -63,9 +63,9 @@ int main(int argc, char *argv[]) {
                 if (compiledFromPackageSource())
                     std::cout << "Compiled using package source." << std::endl;
                 else {
-                    std::cout << "Compiled using svn";
-                    if (hasMoreSvnInformation()) { //Check if CAMITK_SVN_SUBVERSION_FOUND can be set to "1" otherwise we never get into this 'if'
-                        std::cout << " Rev: " << svnRevision() << ", Date: " << svnDate() << std::endl;
+                    std::cout << "Compiled using git";
+                    if (hasMoreGitInformation()) { // Check if CAMITK_GIT_FOUND can be set to "1" otherwise we never get into this 'if'
+                        std::cout << " Hash: " << gitHash() << ", Date: " << gitDate() << std::endl;
                     }
                     std::cout << "." << std::endl;
                 }

sdk/cmake/modules/macros/GetGitInfo.cmake

@@ -25,14 +25,29 @@ macro(get_git_info dir)
     )
     
     execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --format=%h
+                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                    OUTPUT_VARIABLE CAMITK_GIT_ABBREVIATED_HASH
+                    OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
+    execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --format=%H
                     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
                     OUTPUT_VARIABLE CAMITK_GIT_HASH
                     OUTPUT_STRIP_TRAILING_WHITESPACE
     )
     
+    execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --format=%cd
+                    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                    OUTPUT_VARIABLE CAMITK_GIT_COMMITER_DATE
+                    OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    
     if(NOT CAMITK_GIT_COMMIT_COUNT) 
       message(WARNING "Unable to find the commit number using git : ${GIT_EXECUTABLE}")
       set(CAMITK_GIT_COMMIT_COUNT "unknown")
+      set(CAMITK_GIT_BRANCH "unknown")
+      set(CAMITK_GIT_HASH "unknown")
+      set(CAMITK_GIT_ABBREVIATED_HASH "unknown")
     endif()
 
 endmacro()
\ No newline at end of file