Import Geant4 10.0.0 source tree

cmake/Modules/FindAIDA.cmake

@@ -13,11 +13,6 @@ if(NOT AIDA_CONFIG_EXECUTABLE)
 else()    
   set(AIDA_FOUND TRUE)
 
-  execute_process(
-    COMMAND ${AIDA_CONFIG_EXECUTABLE} --version 
-    OUTPUT_VARIABLE AIDA_VERSION
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-
   execute_process(
     COMMAND ${AIDA_CONFIG_EXECUTABLE} --include
     OUTPUT_VARIABLE AIDA_INCLUDE_DIR
@@ -30,16 +25,31 @@ else()
     OUTPUT_VARIABLE AIDA_LIBRARIES
     OUTPUT_STRIP_TRAILING_WHITESPACE)
 
+  execute_process(
+    COMMAND ${AIDA_CONFIG_EXECUTABLE} --version 
+    OUTPUT_VARIABLE AIDA_VERSION
+    ERROR_VARIABLE AIDA_VERSION_ERROR
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+
   execute_process(
     COMMAND ${AIDA_CONFIG_EXECUTABLE} --implementation
     OUTPUT_VARIABLE AIDA_IMPLEMENTATION
+    ERROR_VARIABLE AIDA_IMPLEMENTATION_ERROR
     OUTPUT_STRIP_TRAILING_WHITESPACE)
 
   # Make variables changeble to the advanced user
   mark_as_advanced(AIDA_CONFIG_EXECUTABLE)
 
   if(NOT AIDA_FIND_QUIETLY)
-    message(STATUS "Found AIDA ${AIDA_VERSION} implemented by ${AIDA_IMPLEMENTATION}")
+    set (OUTPUT "Found AIDA")
+    if (AIDA_VERSION)
+      set (OUTPUT "${OUTPUT} ${AIDA_VERSION}")
+    endif()  
+    if (AIDA_IMPLEMENTATION)
+      set (OUTPUT "${OUTPUT} implemented by ${AIDA_IMPLEMENTATION}")
+    endif()  
+    message(STATUS "${OUTPUT}")
   endif()
+  
 endif()