find_program tidy

Author: casperdcl

SuperBuild/External_HDF5.cmake

@@ -49,9 +49,9 @@ if(NOT ( DEFINED "USE_SYSTEM_${externalProjName}" AND "${USE_SYSTEM_${externalPr
   set(HDF5_BUILD_HL_LIB ${${proj}_USE_CUDA})
 
   if (WIN32 AND (${HDF5_TAG} STREQUAL hdf5-1_8_12))
-    find_program(GIT "git")
+    find_program(GIT "git" REQUIRED)
     set(PATCHFILE "${CMAKE_SOURCE_DIR}/patches/hdf5-${HDF5_DOWNLOAD_VERSION}.patch")
-    set(PATCH_COMMAND git apply -v --ignore-space-change --ignore-whitespace ${PATCHFILE})
+    set(PATCH_COMMAND "${GIT}" apply -v --ignore-space-change --ignore-whitespace "${PATCHFILE}")
   else()
     #make it empty, just to be sure
     set(PATCH_COMMAND )

SuperBuild/External_ISMRMRD.cmake

@@ -58,17 +58,11 @@ if(NOT ( DEFINED "USE_SYSTEM_${externalProjName}" AND "${USE_SYSTEM_${externalPr
     endif()
   endif ()
 
-  if (${${proj}_TAG} STREQUAL "v1.13.7" AND DEFINED PATCH_ISMRMRD)
+  if(DEFINED PATCH_ISMRMRD AND (${${proj}_TAG} MATCHES "v1.13.7|v1.15.0"))
+    find_program(GIT "git" REQUIRED)
     message(STATUS "patching ISMRMRD to fix cURL linking error")
-    find_program(GIT "git")
-    set(PATCHFILE "${CMAKE_SOURCE_DIR}/patches/ismrmrd-1.37.7.patch")
-    set(PATCH_COMMAND git apply -v --ignore-space-change --ignore-whitespace ${PATCHFILE})
-  endif()
-  if (${${proj}_TAG} STREQUAL "v1.15.0" AND DEFINED PATCH_ISMRMRD)
-    message(STATUS "patching ISMRMRD to fix cURL linking error")
-    find_program(GIT "git")
-    set(PATCHFILE "${CMAKE_SOURCE_DIR}/patches/ismrmrd-1.15.0.patch")
-    set(PATCH_COMMAND git apply -v --ignore-space-change --ignore-whitespace ${PATCHFILE})
+    set(PATCHFILE "${CMAKE_SOURCE_DIR}/patches/ismrmrd-${${proj}_TAG}.patch")
+    set(PATCH_COMMAND "${GIT}" apply -v --ignore-space-change --ignore-whitespace "${PATCHFILE}")
   endif()
 
   ExternalProject_Add(${proj}