ENH: add 64 bit sgi

4 files changed, 38 insertions, 15 deletions

diff --git a/Utilities/Release/dashsun1_release.cmake b/Utilities/Release/dashsun1_release.cmake
index adb6f63..ed435fb 100644
--- a/Utilities/Release/dashsun1_release.cmake
+++ b/Utilities/Release/dashsun1_release.cmake
@@ -1,14 +1,9 @@
 set(PROCESSORS 1)
 set(HOST dashsun1)
-set(MAKE "make")
-execute_process(COMMAND ssh ${HOST}
-  pwd RESULT_VARIABLE result OUTPUT_VARIABLE BUILD_DIR)
-# now strip the newline (we need perl chop...)
-string(LENGTH "${BUILD_DIR}" length)
-math(EXPR length "${length} -1" )
-string(SUBSTRING "${BUILD_DIR}" 0 ${length} BUILD_DIR)
+set(CMAKE_RELEASE_DIRECTORY "/home/kitware/CMakeReleaseDirectory" )
+set(MAKE_PROGRAM "make")
 set(USER_MAKE_RULE_FILE
-  "${BUILD_DIR}/CMakeReleaseDirectory/UserMakeRules.cmake")
+  "/home/kitware/CMakeReleaseDirectory/UserMakeRules.cmake")
 set(INITIAL_CACHE "
 CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
 CMAKE_BUILD_TYPE:STRING=Release
diff --git a/Utilities/Release/muse_release64.cmake b/Utilities/Release/muse_release64.cmake
new file mode 100644
index 0000000..cd87f51
--- /dev/null
+++ b/Utilities/Release/muse_release64.cmake
@@ -0,0 +1,14 @@
+set(CMAKE_RELEASE_DIRECTORY "/home/collab/itk/CMakeReleaseDirectory64" )
+set(PROCESSORS 20)
+set(CFLAGS "-64")
+set(CXXFLAGS "-64")
+set(LDFLAGS="-64")
+set(HOST muse)
+set(SCRIPT_NAME muse64)
+set(MAKE_PROGRAM "gmake")
+set(MAKE "${MAKE_PROGRAM} -j20")
+set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release
+CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
+")
+get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
+include(${path}/release_cmake.cmake)
diff --git a/Utilities/Release/release_cmake.cmake b/Utilities/Release/release_cmake.cmake
index fee2141..bf2298f 100644
--- a/Utilities/Release/release_cmake.cmake
+++ b/Utilities/Release/release_cmake.cmake
@@ -7,6 +7,9 @@ endif(DEFINED EXTRA_COPY)
 if(NOT DEFINED CMAKE_RELEASE_DIRECTORY)
   set(CMAKE_RELEASE_DIRECTORY "~/CMakeReleaseDirectory")
 endif(NOT DEFINED CMAKE_RELEASE_DIRECTORY)
+if(NOT DEFINED SCRIPT_NAME)
+  set(SCRIPT_NAME "${HOST}")
+endif(NOT DEFINED SCRIPT_NAME)
 if(NOT DEFINED MAKE_PROGRAM)
   message(FATAL_ERROR "MAKE_PROGRAM must be set")
 endif(NOT DEFINED MAKE_PROGRAM)
@@ -63,19 +66,19 @@ endmacro(remote_command)
 # set this so configure file will work from script mode
 set(CMAKE_BACKWARDS_COMPATIBILITY 2.4)
 # create the script specific for the given host
-configure_file(${SCRIPT_PATH}/release_cmake.sh.in
-  release_cmake-${HOST}.sh @ONLY)
+set(SCRIPT_FILE release_cmake-${SCRIPT_NAME}.sh)
+configure_file(${SCRIPT_PATH}/release_cmake.sh.in ${SCRIPT_FILE} @ONLY)
 # remove any old version of the script
-remote_command("remove old release_cmake-${HOST}.sh from server"
-  "rm -f release_cmake-${HOST}.sh")
+remote_command("remove old ${SCRIPT_FILE} from server"
+  "rm -f  ${SCRIPT_FILE}")
 # copy the script to the remote host via cat with the 
 # script as input for the execute_process this will translate
 # the file from dos to unix
 remote_command("Copy release_cmake-${HOST}.sh to sever"
-  "cat > release_cmake-${HOST}.sh" release_cmake-${HOST}.sh)
+  "cat > ${SCRIPT_FILE}" ${SCRIPT_FILE})
 
 # now run the script on the remote machine
-remote_command("Run release script" "${RUN_SHELL} release_cmake-${HOST}.sh")
+remote_command("Run release script" "${RUN_SHELL} ${SCRIPT_FILE}")
 
 message("copy the .gz file back from the machine")
 message("scp ${HOST}:${CMAKE_RELEASE_DIRECTORY}/${CMAKE_VERSION}-build/*.gz .")
diff --git a/Utilities/Release/release_cmake.sh.in b/Utilities/Release/release_cmake.sh.in
index 2dce3cd..77a3752 100755
--- a/Utilities/Release/release_cmake.sh.in
+++ b/Utilities/Release/release_cmake.sh.in
@@ -24,9 +24,20 @@ if [ ! -z "@CXX@" ]; then
     export CXX="@CXX@"
     check_exit_value $? "set CC compiler env var" || exit 1
 fi
+
 if [ ! -z "@LDFLAGS@" ]; then
     export LDFLAGS="@LDFLAGS@"
-    check_exit_value $? "set CC compiler env var" || exit 1
+    check_exit_value $? "set LDFLAGS env var" || exit 1
+fi
+
+if [ ! -z "@CFLAGS@" ]; then
+    export CFLAGS="@CFLAGS@"
+    check_exit_value $? "set CFLAGS  env var" || exit 1
+fi
+
+if [ ! -z "@CXXFLAGS@" ]; then
+    export CXXFLAGS="@CXXFLAGS@"
+    check_exit_value $? "setCXXFLAGS env var" || exit 1
 fi
 
 if [ ! -z "@USER_MAKE_RULE_FILE_CONTENTS@" ]; then