Imported Upstream version 2.8.10.2upstream/2.8.10.2

12 files changed, 112 insertions, 78 deletions

diff --git a/Utilities/Release/Cygwin/CMakeLists.txt b/Utilities/Release/Cygwin/CMakeLists.txt
index 2420c97d9..c59a6fa94 100644
--- a/Utilities/Release/Cygwin/CMakeLists.txt
+++ b/Utilities/Release/Cygwin/CMakeLists.txt
@@ -1,25 +1,25 @@
-FILE(GLOB INSTALLED_CURSES /usr/bin/cygncurses-*.dll)
-SET(MAX 0)
-FOREACH(f ${INSTALLED_CURSES})
-  IF(NOT "${f}" MATCHES "\\+")
-    STRING(REGEX REPLACE ".*-([0-9]*).dll" "\\1" NUMBER "${f}")
-    IF(NUMBER GREATER MAX)
-      SET(MAX ${NUMBER}) 
-    ENDIF(NUMBER GREATER MAX)
-  ENDIF(NOT "${f}" MATCHES "\\+")
-ENDFOREACH(f)
-STRING(REGEX REPLACE "/usr/bin/" "\\1" NUMBER "${f}")
-SET(CMAKE_NCURSES_VERSION "libncurses${MAX}")
-MESSAGE(STATUS "Using curses version: libncurses${MAX}")
-CONFIGURE_FILE("${CMake_SOURCE_DIR}/Utilities/Release/Cygwin/cygwin-setup.hint.in"
+file(GLOB INSTALLED_CURSES /usr/bin/cygncurses-*.dll)
+set(MAX 0)
+foreach(f ${INSTALLED_CURSES})
+  if(NOT "${f}" MATCHES "\\+")
+    string(REGEX REPLACE ".*-([0-9]*).dll" "\\1" NUMBER "${f}")
+    if(NUMBER GREATER MAX)
+      set(MAX ${NUMBER})
+    endif()
+  endif()
+endforeach()
+string(REGEX REPLACE "/usr/bin/" "\\1" NUMBER "${f}")
+set(CMAKE_NCURSES_VERSION "libncurses${MAX}")
+message(STATUS "Using curses version: libncurses${MAX}")
+configure_file("${CMake_SOURCE_DIR}/Utilities/Release/Cygwin/cygwin-setup.hint.in"
   "${CMake_BINARY_DIR}/setup.hint")
-CONFIGURE_FILE("${CMake_SOURCE_DIR}/Utilities/Release/Cygwin/README.cygwin.in"
+configure_file("${CMake_SOURCE_DIR}/Utilities/Release/Cygwin/README.cygwin.in"
   "${CMake_BINARY_DIR}/Docs/@CPACK_PACKAGE_FILE_NAME@-@CPACK_CYGWIN_PATCH_NUMBER@.README")
-INSTALL_FILES(/share/doc/Cygwin FILES
+install_files(/share/doc/Cygwin FILES
   ${CMake_BINARY_DIR}/Docs/@CPACK_PACKAGE_FILE_NAME@-@CPACK_CYGWIN_PATCH_NUMBER@.README
   )
-CONFIGURE_FILE("${CMake_SOURCE_DIR}/Utilities/Release/Cygwin/cygwin-package.sh.in"
+configure_file("${CMake_SOURCE_DIR}/Utilities/Release/Cygwin/cygwin-package.sh.in"
   ${CPACK_CYGWIN_BUILD_SCRIPT})
-CONFIGURE_FILE("${CMake_SOURCE_DIR}/Utilities/Release/Cygwin/cygwin-patch.diff.in"
+configure_file("${CMake_SOURCE_DIR}/Utilities/Release/Cygwin/cygwin-patch.diff.in"
   ${CPACK_CYGWIN_PATCH_FILE})
 
diff --git a/Utilities/Release/Cygwin/cygwin-package.sh.in b/Utilities/Release/Cygwin/cygwin-package.sh.in
index 9730b3332..dff27f14d 100755
--- a/Utilities/Release/Cygwin/cygwin-package.sh.in
+++ b/Utilities/Release/Cygwin/cygwin-package.sh.in
@@ -4,11 +4,11 @@ TOP_DIR=`cd \`echo "$0" | sed -n '/\//{s/\/[^\/]*$//;p;}'\`;pwd`
 mkdirs()
 {
   (
-  mkdir -p "$TOP_DIR/@CPACK_PACKAGE_FILE_NAME@/.build" 
+  mkdir -p "$TOP_DIR/@CPACK_PACKAGE_FILE_NAME@/.build"
   )
 }
 
-# cd into 
+# cd into
 # untar source tree and apply patch
 prep()
 {
@@ -23,7 +23,7 @@ prep()
 conf()
 {
   (
-  cd "$TOP_DIR/@CPACK_PACKAGE_FILE_NAME@/.build" && 
+  cd "$TOP_DIR/@CPACK_PACKAGE_FILE_NAME@/.build" &&
   ../bootstrap --parallel=2
   )
 }
@@ -49,8 +49,8 @@ pkg()
 {
   (
   cd "$TOP_DIR/@CPACK_PACKAGE_FILE_NAME@/.build" &&
-  ./bin/cpack && 
-  mv @CPACK_PACKAGE_FILE_NAME@-@CPACK_CYGWIN_PATCH_NUMBER@.tar.bz2 "$TOP_DIR"     
+  ./bin/cpack &&
+  mv @CPACK_PACKAGE_FILE_NAME@-@CPACK_CYGWIN_PATCH_NUMBER@.tar.bz2 "$TOP_DIR"
   )
 }
 
@@ -59,7 +59,7 @@ spkg()
  (
   cd "$TOP_DIR/@CPACK_PACKAGE_FILE_NAME@/.build" &&
   ./bin/cpack --config  CPackSourceConfig.cmake &&
-  mv @CPACK_PACKAGE_FILE_NAME@-@CPACK_CYGWIN_PATCH_NUMBER@-src.tar.bz2 "$TOP_DIR" 
+  mv @CPACK_PACKAGE_FILE_NAME@-@CPACK_CYGWIN_PATCH_NUMBER@-src.tar.bz2 "$TOP_DIR"
   )
 }
 
diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake
index c304e6777..37e223d28 100644
--- a/Utilities/Release/create-cmake-release.cmake
+++ b/Utilities/Release/create-cmake-release.cmake
@@ -32,7 +32,7 @@ ${CMAKE_COMMAND} -DCMAKE_CREATE_VERSION=${CMAKE_CREATE_VERSION} -P ${CMAKE_ROOT}
 xterm -geometry 64x6+${x}+${y} -sb -sl 2000 -T ${f}-${CMAKE_CREATE_VERSION}.log -e tail -f  ${CMAKE_CURRENT_SOURCE_DIR}/logs/${f}-${CMAKE_CREATE_VERSION}.log&
 ")
     math(EXPR i "${i}+1")
-  endforeach(f)
+  endforeach()
   execute_process(COMMAND chmod a+x ${filename})
 endfunction()
 
diff --git a/Utilities/Release/dash2win64_cygwin.cmake b/Utilities/Release/dash2win64_cygwin.cmake
index 78e8df0af..663c61581 100644
--- a/Utilities/Release/dash2win64_cygwin.cmake
+++ b/Utilities/Release/dash2win64_cygwin.cmake
@@ -16,4 +16,12 @@ set(CC  gcc)
 set(SCRIPT_NAME dash2win64cygwin)
 set(GIT_EXTRA "git config core.autocrlf true")
 get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
+# WARNING: Temporary fix!! This exclusion of the ExternalProject test
+# is temporary until we can set up a new cygwin build machine.
+# It only fails because of cygwin/non-cygwin "svn" mismatches in this
+# particular environment. This is less than ideal, but at least it
+# allows us to produce cygwin builds in the short term.
+set(EXTRA_CTEST_ARGS "-E ExternalProject")
+
 include(${path}/release_cmake.cmake)
diff --git a/Utilities/Release/dash2win64_release.cmake b/Utilities/Release/dash2win64_release.cmake
index fb82de0d0..6d1ac767e 100644
--- a/Utilities/Release/dash2win64_release.cmake
+++ b/Utilities/Release/dash2win64_release.cmake
@@ -8,6 +8,7 @@ set(CPACK_SOURCE_GENERATORS "ZIP")
 set(MAKE_PROGRAM "make")
 set(MAKE "${MAKE_PROGRAM} -j8")
 set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release
+CMAKE_USE_OPENSSL:BOOL=ON
 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
 CMAKE_Fortran_COMPILER:FILEPATH=FALSE
 CMAKE_GENERATOR:INTERNAL=Unix Makefiles
diff --git a/Utilities/Release/dashmacmini2_release.cmake b/Utilities/Release/dashmacmini2_release.cmake
index 3e6b04973..5e57a70b2 100644
--- a/Utilities/Release/dashmacmini2_release.cmake
+++ b/Utilities/Release/dashmacmini2_release.cmake
@@ -9,6 +9,10 @@ set(CPACK_BINARY_GENERATORS "PackageMaker TGZ TZ")
 set(INITIAL_CACHE "
 CMAKE_BUILD_TYPE:STRING=Release
 CMAKE_OSX_ARCHITECTURES:STRING=ppc;i386
+CMAKE_USE_OPENSSL:BOOL=ON
+OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1c-install/lib/libcrypto.a
+OPENSSL_INCLUDE_DIR:PATH=/Users/kitware/openssl-1.0.1c-install/include
+OPENSSL_SSL_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1c-install/lib/libssl.a
 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
 CPACK_SYSTEM_NAME:STRING=Darwin-universal
 BUILD_QtDialog:BOOL=TRUE
diff --git a/Utilities/Release/dashmacmini5_release.cmake b/Utilities/Release/dashmacmini5_release.cmake
index bd93a8733..36b095287 100644
--- a/Utilities/Release/dashmacmini5_release.cmake
+++ b/Utilities/Release/dashmacmini5_release.cmake
@@ -8,6 +8,10 @@ set(MAKE "${MAKE_PROGRAM} -j5")
 set(CPACK_BINARY_GENERATORS "PackageMaker TGZ TZ")
 set(CPACK_SOURCE_GENERATORS "TGZ TZ")
 set(INITIAL_CACHE "
+CMAKE_USE_OPENSSL:BOOL=ON
+OPENSSL_CRYPTO_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1c-install/lib/libcrypto.a
+OPENSSL_INCLUDE_DIR:PATH=/Users/kitware/openssl-1.0.1c-install/include
+OPENSSL_SSL_LIBRARY:FILEPATH=/Users/kitware/openssl-1.0.1c-install/lib/libssl.a
 CMAKE_BUILD_TYPE:STRING=Release
 CMAKE_OSX_ARCHITECTURES:STRING=x86_64;i386
 CMAKE_OSX_DEPLOYMENT_TARGET:STRING=10.5
diff --git a/Utilities/Release/magrathea_release.cmake b/Utilities/Release/magrathea_release.cmake
index 1b2ae02c7..4783fdad3 100644
--- a/Utilities/Release/magrathea_release.cmake
+++ b/Utilities/Release/magrathea_release.cmake
@@ -3,11 +3,17 @@ set(HOST magrathea)
 set(MAKE_PROGRAM "make")
 set(CC gcc332s)
 set(CXX c++332s)
+set(CFLAGS   -DDT_RUNPATH=29)
+set(CXXFLAGS -DDT_RUNPATH=29)
 set(INITIAL_CACHE "
 CMAKE_BUILD_TYPE:STRING=Release
 CURSES_LIBRARY:FILEPATH=/usr/i686-gcc-332s/lib/libncurses.a
 CURSES_INCLUDE_PATH:PATH=/usr/i686-gcc-332s/include/ncurses
 FORM_LIBRARY:FILEPATH=/usr/i686-gcc-332s/lib/libform.a
+CMAKE_USE_OPENSSL:BOOL=ON
+OPENSSL_CRYPTO_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.1c-install/lib/libcrypto.a
+OPENSSL_INCLUDE_DIR:PATH=/home/kitware/openssl-1.0.1c-install/include
+OPENSSL_SSL_LIBRARY:FILEPATH=/home/kitware/openssl-1.0.1c-install/lib/libssl.a
 CPACK_SYSTEM_NAME:STRING=Linux-i386
 BUILD_QtDialog:BOOL:=TRUE
 QT_QMAKE_EXECUTABLE:FILEPATH=/home/kitware/qt-4.43-install/bin/qmake
diff --git a/Utilities/Release/release_cmake.cmake b/Utilities/Release/release_cmake.cmake
index 0c9b3f9c5..f351ac8c0 100644
--- a/Utilities/Release/release_cmake.cmake
+++ b/Utilities/Release/release_cmake.cmake
@@ -3,31 +3,31 @@ get_filename_component(SCRIPT_PATH "${CMAKE_CURRENT_LIST_FILE}" PATH)
 # default to self extracting tgz, tgz, and tar.Z
 if(NOT DEFINED CPACK_BINARY_GENERATORS)
   set(CPACK_BINARY_GENERATORS "STGZ TGZ TZ")
-endif(NOT DEFINED CPACK_BINARY_GENERATORS)
+endif()
 if(DEFINED EXTRA_COPY)
   set(HAS_EXTRA_COPY 1)
-endif(DEFINED EXTRA_COPY)
+endif()
 if(NOT DEFINED CMAKE_RELEASE_DIRECTORY)
   set(CMAKE_RELEASE_DIRECTORY "~/CMakeReleaseDirectory")
-endif(NOT DEFINED CMAKE_RELEASE_DIRECTORY)
+endif()
 if(NOT DEFINED SCRIPT_NAME)
   set(SCRIPT_NAME "${HOST}")
-endif(NOT DEFINED SCRIPT_NAME)
+endif()
 if(NOT DEFINED MAKE_PROGRAM)
   message(FATAL_ERROR "MAKE_PROGRAM must be set")
-endif(NOT DEFINED MAKE_PROGRAM)
+endif()
 if(NOT DEFINED MAKE)
   set(MAKE "${MAKE_PROGRAM}")
-endif(NOT DEFINED MAKE)
+endif()
 if(NOT DEFINED RUN_SHELL)
   set(RUN_SHELL "/bin/sh")
-endif(NOT DEFINED RUN_SHELL)
+endif()
 if(NOT DEFINED PROCESSORS)
   set(PROCESSORS 1)
-endif(NOT DEFINED PROCESSORS)
+endif()
 if(NOT DEFINED CMAKE_CREATE_VERSION)
   message(FATAL_ERROR "CMAKE_CREATE_VERSION not defined")
-endif(NOT DEFINED CMAKE_CREATE_VERSION)
+endif()
 if(NOT DEFINED GIT_COMMAND)
   set(GIT_COMMAND git)
 endif()
@@ -40,15 +40,15 @@ endif()
 
 if(NOT DEFINED FINAL_PATH )
   set(FINAL_PATH ${CMAKE_RELEASE_DIRECTORY}/${CMAKE_CREATE_VERSION}-build)
-endif(NOT DEFINED FINAL_PATH )
+endif()
 
 if(NOT HOST)
   message(FATAL_ERROR "HOST must be specified with -DHOST=host")
-endif(NOT HOST)
+endif()
 if(NOT DEFINED MAKE)
   message(FATAL_ERROR "MAKE must be specified with -DMAKE=\"make -j2\"")
-endif(NOT DEFINED MAKE)
-  
+endif()
+
 message("Creating CMake release ${CMAKE_CREATE_VERSION} on ${HOST} with parallel = ${PROCESSORS}")
 
 # define a macro to run a remote command
@@ -57,14 +57,14 @@ macro(remote_command comment command)
   if(${ARGC} GREATER 2)
     message("ssh ${HOST} ${EXTRA_HOP} ${command}")
     execute_process(COMMAND ssh ${HOST} ${EXTRA_HOP} ${command} RESULT_VARIABLE result INPUT_FILE ${ARGV2})
-  else(${ARGC} GREATER 2)
-    message("ssh ${HOST} ${EXTRA_HOP} ${command}") 
-    execute_process(COMMAND ssh ${HOST} ${EXTRA_HOP} ${command} RESULT_VARIABLE result) 
-  endif(${ARGC} GREATER 2)
+  else()
+    message("ssh ${HOST} ${EXTRA_HOP} ${command}")
+    execute_process(COMMAND ssh ${HOST} ${EXTRA_HOP} ${command} RESULT_VARIABLE result)
+  endif()
   if(${result} GREATER 0)
     message(FATAL_ERROR "Error running command: ${command}, return value = ${result}")
-  endif(${result} GREATER 0)
-endmacro(remote_command)
+  endif()
+endmacro()
 
 # set this so configure file will work from script mode
 # create the script specific for the given host
@@ -73,64 +73,64 @@ configure_file(${SCRIPT_PATH}/release_cmake.sh.in ${SCRIPT_FILE} @ONLY)
 
 # run the script by starting a shell on the remote machine
 # then using the script file as input to the shell
-IF(RUN_LOCAL)
+if(RUN_LOCAL)
   message(FATAL_ERROR "run this command: ${RUN_SHELL} ${SCRIPT_FILE}")
-ELSE(RUN_LOCAL)
+else()
   remote_command("run release_cmake-${HOST}.sh on server"
     "${RUN_SHELL}" ${SCRIPT_FILE})
-ENDIF(RUN_LOCAL)
+endif()
 
-# now figure out which types of packages were created 
+# now figure out which types of packages were created
 set(generators ${CPACK_BINARY_GENERATORS} ${CPACK_SOURCE_GENERATORS})
 separate_arguments(generators)
 foreach(gen ${generators})
   if("${gen}" STREQUAL "TGZ")
     set(SUFFIXES ${SUFFIXES} "*.tar.gz")
-  endif("${gen}" STREQUAL "TGZ")
+  endif()
   if("${gen}" STREQUAL "STGZ")
     set(SUFFIXES ${SUFFIXES} "*.sh")
-  endif("${gen}" STREQUAL "STGZ")
+  endif()
   if("${gen}" STREQUAL "PackageMaker")
     set(SUFFIXES ${SUFFIXES} "*.dmg")
-  endif("${gen}" STREQUAL "PackageMaker")
+  endif()
   if("${gen}" STREQUAL "TBZ2")
     set(SUFFIXES ${SUFFIXES} "*.tar.bz2")
-  endif("${gen}" STREQUAL "TBZ2")
+  endif()
   if("${gen}" MATCHES "Cygwin")
     set(SUFFIXES ${SUFFIXES} "*.tar.bz2")
     set(extra_files setup.hint)
-  endif("${gen}" MATCHES "Cygwin")
+  endif()
   if("${gen}" STREQUAL "TZ")
     set(SUFFIXES ${SUFFIXES} "*.tar.Z")
-  endif("${gen}" STREQUAL "TZ")
+  endif()
   if("${gen}" STREQUAL "ZIP")
     set(SUFFIXES ${SUFFIXES} "*.zip")
-  endif("${gen}" STREQUAL "ZIP")
+  endif()
   if("${gen}" STREQUAL "NSIS")
     set(SUFFIXES ${SUFFIXES} "*.exe")
-  endif("${gen}" STREQUAL "NSIS")
-endforeach(gen)
+  endif()
+endforeach()
 # copy all the files over from the remote machine
 set(PROJECT_PREFIX cmake-)
 foreach(suffix ${SUFFIXES})
   message("scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} .")
-  execute_process(COMMAND 
+  execute_process(COMMAND
     scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} .
-    RESULT_VARIABLE result)   
+    RESULT_VARIABLE result)
   if(${result} GREATER 0)
     message("error getting file back scp ${HOST}:${FINAL_PATH}/${PROJECT_PREFIX}${suffix} .")
-  endif(${result} GREATER 0)
-endforeach(suffix)
+  endif()
+endforeach()
 
 # if there are extra files to copy get them as well
 if(extra_files)
   foreach(f ${extra_files})
     message("scp ${HOST}:${FINAL_PATH}/${f} .")
-    execute_process(COMMAND 
+    execute_process(COMMAND
       scp ${HOST}:${FINAL_PATH}/${f} .
       RESULT_VARIABLE result)
     if(${result} GREATER 0)
       message("error getting file back scp ${HOST}:${FINAL_PATH}/${f} .")
-    endif(${result} GREATER 0)
-  endforeach(f)
-endif(extra_files)
+    endif()
+  endforeach()
+endif()
diff --git a/Utilities/Release/release_cmake.sh.in b/Utilities/Release/release_cmake.sh.in
index 50882c5de..82c039b43 100755
--- a/Utilities/Release/release_cmake.sh.in
+++ b/Utilities/Release/release_cmake.sh.in
@@ -3,7 +3,7 @@ echo "Start release"
 date
 echo ""
 echo  "remove and create working directory @CMAKE_RELEASE_DIRECTORY@"
-rm -rf @CMAKE_RELEASE_DIRECTORY@ 
+rm -rf @CMAKE_RELEASE_DIRECTORY@
 mkdir @CMAKE_RELEASE_DIRECTORY@
 
 check_exit_value()
@@ -12,7 +12,7 @@ check_exit_value()
    if [ "$VALUE" != "0" ]; then
     echo "error in $2"
     exit 1
-   fi      
+   fi
 }
 
 if [ ! -z "@CC@" ]; then
@@ -77,7 +77,7 @@ if [ ! -z "@USER_OVERRIDE@" ]; then
 fi
 
 echo "Checkout the source for @CMAKE_CREATE_VERSION@"
-cd @CMAKE_RELEASE_DIRECTORY@ 
+cd @CMAKE_RELEASE_DIRECTORY@
 if [ ! -z "@GIT_COMMAND@" ]; then
    # clone the repo without creating any source files in the directory
    # matching the branch being built (i.e. master CMake-2-8, etc)
@@ -97,9 +97,9 @@ else
    exit 1
 fi
 
-cd @CMAKE_RELEASE_DIRECTORY@/@CMAKE_CREATE_VERSION@-build 
+cd @CMAKE_RELEASE_DIRECTORY@/@CMAKE_CREATE_VERSION@-build
 
-if [ ! -z "@CONFIGURE_WITH_CMAKE@" ]; then 
+if [ ! -z "@CONFIGURE_WITH_CMAKE@" ]; then
     echo  "Run cmake to configure cmake"
     @CMAKE_CONFIGURE_PATH@ ../@CMAKE_CREATE_VERSION@
     check_exit_value $? "Configure cmake" || exit 1
@@ -121,11 +121,11 @@ check_exit_value $? "Build cmake" || exit 1
 
 if [ -z "@SKIP_TESTS@" ]; then
     echo "Run cmake tests"
-    ./bin/ctest --output-on-failure -j @PROCESSORS@ test
+    ./bin/ctest --output-on-failure -j @PROCESSORS@ @EXTRA_CTEST_ARGS@
     check_exit_value $? "Test cmake" || exit 1
 fi
 
-# loop over binary generators 
+# loop over binary generators
 generators="@CPACK_BINARY_GENERATORS@"
 for GEN in $generators; do
     echo "Create $GEN package"
@@ -133,7 +133,7 @@ for GEN in $generators; do
     check_exit_value $? "Create $GEN package" || exit 1
 done
 
-# loop over source generators 
+# loop over source generators
 generators="@CPACK_SOURCE_GENERATORS@"
 for GEN in $generators; do
     echo "Create $GEN package"
diff --git a/Utilities/Release/upload_release.cmake b/Utilities/Release/upload_release.cmake
index dc6c78f38..9bf35236d 100644
--- a/Utilities/Release/upload_release.cmake
+++ b/Utilities/Release/upload_release.cmake
@@ -1,4 +1,7 @@
-set(PROJECT_PREFIX cmake-)
+set(CTEST_RUN_CURRENT_SCRIPT 0)
+if(NOT DEFINED PROJECT_PREFIX)
+  set(PROJECT_PREFIX cmake-)
+endif()
 if(NOT VERSION)
  set(VERSION 2.8)
 endif()
@@ -16,15 +19,22 @@ set(count 0)
 foreach(file ${FILES})
   if(NOT IS_DIRECTORY ${file})
     message("upload ${file} ${UPLOAD_LOC}")
-    execute_process(COMMAND 
+    execute_process(COMMAND
       scp ${file} ${UPLOAD_LOC}
-      RESULT_VARIABLE result)  
-    math(EXPR count "${count} + 1")
+      RESULT_VARIABLE result)
     if("${result}" GREATER 0)
       message(FATAL_ERROR "failed to upload file to ${UPLOAD_LOC}")
     endif()
+
+    # Pause to give each upload a distinct (to the nearest second)
+    # time stamp
+    if(COMMAND ctest_sleep)
+      ctest_sleep(2)
+    endif()
+
+    math(EXPR count "${count} + 1")
   endif()
-endforeach(file)
+endforeach()
 if(${count} EQUAL 0)
    message(FATAL_ERROR "Error no files uploaded.")
 endif()
diff --git a/Utilities/Release/v20n250_aix_release.cmake b/Utilities/Release/v20n250_aix_release.cmake
index 53c34d7ce..cc8cd058b 100644
--- a/Utilities/Release/v20n250_aix_release.cmake
+++ b/Utilities/Release/v20n250_aix_release.cmake
@@ -7,6 +7,7 @@ set(MAKE_PROGRAM "make")
 set(CC "xlc_r")
 set(CXX "xlC_r")
 set(FC "xlf")
+set(LDFLAGS "-Wl,-bmaxdata:0x80000000") # Push "Segmentation fault in extend_brk" over horizon
 set(INITIAL_CACHE "
 CMAKE_BUILD_TYPE:STRING=Release
 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE