MonetDB: Dec2023 - Only execuyte hg/git when we found the program.

[Sjoerd Mullender via checkin-list]

Changeset: 5270722c3891 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5270722c3891
Modified Files:
        common/utils/GenerateVersionHeader.cmake
Branch: Dec2023
Log Message:

Only execuyte hg/git when we found the program.


diffs (54 lines):

diff --git a/common/utils/GenerateVersionHeader.cmake 
b/common/utils/GenerateVersionHeader.cmake
--- a/common/utils/GenerateVersionHeader.cmake
+++ b/common/utils/GenerateVersionHeader.cmake
@@ -18,34 +18,34 @@ elseif(EXISTS "${DIR}/.hg")
   find_package(Hg)
   if(HG_FOUND)
     message("hg found: ${HG_EXECUTABLE}")
+    execute_process(COMMAND "${HG_EXECUTABLE}" "id" "-i" WORKING_DIRECTORY 
"${DIR}" RESULT_VARIABLE HG_RETURN_CODE
+      OUTPUT_VARIABLE HG_OUPUT_RES OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(HG_RETURN_CODE EQUAL 0 AND HG_OUPUT_RES)
+      set(MERCURIAL_ID "${HG_OUPUT_RES}")
+    else()
+      message(WARNING "Failed to find mercurial ID")
+      set(MERCURIAL_ID "Unknown")
+    endif()
   else()
     message(WARNING "Failed to find mercurial")
     set(MERCURIAL_ID "Unknown")
   endif()
-  execute_process(COMMAND "${HG_EXECUTABLE}" "id" "-i" WORKING_DIRECTORY 
"${DIR}" RESULT_VARIABLE HG_RETURN_CODE
-    OUTPUT_VARIABLE HG_OUPUT_RES OUTPUT_STRIP_TRAILING_WHITESPACE)
-  if(HG_RETURN_CODE EQUAL 0 AND HG_OUPUT_RES)
-    set(MERCURIAL_ID "${HG_OUPUT_RES}")
-  else()
-    message(WARNING "Failed to find mercurial ID")
-    set(MERCURIAL_ID "Unknown")
-  endif()
 elseif(EXISTS "${DIR}/.git")
   find_package(Git)
   if(GIT_FOUND)
     message("git found: ${GIT_EXECUTABLE}")
+    execute_process(COMMAND "${GIT_EXECUTABLE}" "rev-parse" "--short" "HEAD" 
WORKING_DIRECTORY "${DIR}"
+      RESULT_VARIABLE GIT_RETURN_CODE OUTPUT_VARIABLE GIT_OUPUT_RES 
OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if(GIT_RETURN_CODE EQUAL 0 AND GIT_OUPUT_RES)
+      set(MERCURIAL_ID "${GIT_OUPUT_RES}")
+    else()
+      message(WARNING "Failed to find git ID")
+      set(MERCURIAL_ID "Unknown")
+    endif()
   else()
     message(WARNING "Failed to find git")
     set(MERCURIAL_ID "Unknown")
   endif()
-  execute_process(COMMAND "${GIT_EXECUTABLE}" "rev-parse" "--short" "HEAD" 
WORKING_DIRECTORY "${DIR}"
-    RESULT_VARIABLE GIT_RETURN_CODE OUTPUT_VARIABLE GIT_OUPUT_RES 
OUTPUT_STRIP_TRAILING_WHITESPACE)
-  if(GIT_RETURN_CODE EQUAL 0 AND GIT_OUPUT_RES)
-    set(MERCURIAL_ID "${GIT_OUPUT_RES}")
-  else()
-    message(WARNING "Failed to find git ID")
-    set(MERCURIAL_ID "Unknown")
-  endif()
 else()
   set(MERCURIAL_ID "Unknown")
 endif()
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org