Merge pull request #2784 from WardF/gh2744-redux.wif

Replace exec_program with execute_process

CMakeInstallation.cmake

@@ -74,7 +74,7 @@ FIND_PROGRAM(NC_DPKG NAMES dpkg)
 IF(NC_DPKG)
   # Define a macro for getting the dpkg architecture.
   MACRO(getdpkg_arch arch)
-    exec_program("${NC_DPKG}" ARGS "--print-architecture" OUTPUT_VARIABLE "${arch}")
+    execute_process(COMMAND "${NC_DPKG}" "--print-architecture" OUTPUT_VARIABLE "${arch}" OUTPUT_STRIP_TRAILING_WHITESPACE)
   ENDMACRO(getdpkg_arch)
   getdpkg_arch(dpkg_arch)
 

CMakeLists.txt

@@ -57,7 +57,7 @@ SET(NC_DISPATCH_VERSION 5)
 find_program(UNAME NAMES uname)
 IF(UNAME)
   macro(getuname name flag)
-    exec_program("${UNAME}" ARGS "${flag}" OUTPUT_VARIABLE "${name}")
+    execute_process(COMMAND "${UNAME}" "${flag}" OUTPUT_VARIABLE "${name}" OUTPUT_STRIP_TRAILING_WHITESPACE)
   endmacro(getuname)
   getuname(osname -s)
   getuname(osrel  -r)
@@ -1411,7 +1411,7 @@ IF(ENABLE_TESTS)
     SET(HOSTNAME_ARG "-s")
   ENDIF()
   IF(HOSTNAME_CMD)
-    EXEC_PROGRAM(${HOSTNAME_CMD} ARGS "${HOSTNAME_ARG}" OUTPUT_VARIABLE HOSTNAME)
+    EXECUTE_PROCESS(COMMAND ${HOSTNAME_CMD} "${HOSTNAME_ARG}" OUTPUT_VARIABLE HOSTNAME OUTPUT_STRIP_TRAILING_WHITESPACE)
     SET(NC_CTEST_SITE "${HOSTNAME}" CACHE STRING "Hostname of test machine.")
   ENDIF()