ENH: add make program stuff

7 files changed, 22 insertions, 10 deletions

diff --git a/Utilities/Release/dashmacmini2_release.cmake b/Utilities/Release/dashmacmini2_release.cmake
index 9494c26..192d9d6 100644
--- a/Utilities/Release/dashmacmini2_release.cmake
+++ b/Utilities/Release/dashmacmini2_release.cmake
@@ -1,6 +1,7 @@
 set(PROCESSORS 2)
 set(HOST dashmacmini2)
-set(MAKE "make -j2")
+set(MAKE_COMMAND "make")
+set(MAKE "${MAKE_COMMAND} -j2")
 set(INITIAL_CACHE "
 CMAKE_BUILD_TYPE:STRING=Release
 CMAKE_OSX_ARCHITECTURES:STRING=ppc\;i386
diff --git a/Utilities/Release/destiny_release.cmake b/Utilities/Release/destiny_release.cmake
index a9f08ad..fff1a2b 100644
--- a/Utilities/Release/destiny_release.cmake
+++ b/Utilities/Release/destiny_release.cmake
@@ -2,7 +2,7 @@ set(PROCESSORS 1)
 set(RUN_SHELL "/usr/local/bin/zsh -l")
 set(CVS_COMMAND "/usr/local/bin/cvs")
 set(HOST destiny)
-set(MAKE "gmake")
+set(MAKE_COMMAND "/usr/local/bin/gmake")
 set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release
 CMAKE_EXE_LINKER_FLAGS:STRING=-Wl,-a,archive_shared
 CMAKE_C_FLAGS:STRING=+DAportable
diff --git a/Utilities/Release/hythloth_release.cmake b/Utilities/Release/hythloth_release.cmake
index 8ecf987..95766ed 100644
--- a/Utilities/Release/hythloth_release.cmake
+++ b/Utilities/Release/hythloth_release.cmake
@@ -1,6 +1,7 @@
 set(PROCESSORS 2)
 set(HOST hythloth)
-set(MAKE "make -j2")
+set(MAKE_COMMAND "make")
+set(MAKE "${MAKE_COMMAND} -j2")
 set(INITIAL_CACHE "
 CMAKE_BUILD_TYPE:STRING=Release
 ")
diff --git a/Utilities/Release/muse_release.cmake b/Utilities/Release/muse_release.cmake
index a1e61f6..b0429ba 100644
--- a/Utilities/Release/muse_release.cmake
+++ b/Utilities/Release/muse_release.cmake
@@ -1,6 +1,8 @@
+set(CMAKE_RELEASE_DIRECTORY "/home/collab/itk/CMakeReleaseDirectory" )
 set(PROCESSORS 20)
 set(HOST muse)
-set(MAKE "gmake -j20")
+set(MAKE_COMMAND "gmake")
+set(MAKE "${MAKE_COMMAND} -j20")
 set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release")
 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 1b7b138..c1ef5ff 100644
--- a/Utilities/Release/release_cmake.cmake
+++ b/Utilities/Release/release_cmake.cmake
@@ -4,6 +4,12 @@ get_filename_component(SCRIPT_PATH "${CMAKE_CURRENT_LIST_FILE}" PATH)
 if(NOT DEFINED CMAKE_RELEASE_DIRECTORY)
   set(CMAKE_RELEASE_DIRECTORY "~/CMakeReleaseDirectory")
 endif(NOT DEFINED CMAKE_RELEASE_DIRECTORY)
+if(NOT DEFINED MAKE_COMMAND)
+  message(FATAL_ERROR "MAKE_COMMAND must be set")
+endif(NOT DEFINED MAKE_COMMAND)
+if(NOT DEFINED MAKE)
+  set(MAKE "${MAKE_COMMAND}")
+endif(NOT DEFINED MAKE)
 if(NOT DEFINED RUN_SHELL)
   set(RUN_SHELL "/bin/sh")
 endif(NOT DEFINED RUN_SHELL)
diff --git a/Utilities/Release/release_cmake.sh.in b/Utilities/Release/release_cmake.sh.in
index 4adb207..0c26e5b 100755
--- a/Utilities/Release/release_cmake.sh.in
+++ b/Utilities/Release/release_cmake.sh.in
@@ -62,16 +62,18 @@ echo "Build cmake with @MAKE@"
 @MAKE@
 check_exit_value $? "Build cmake" || exit 1
 
-echo "Run cmake tests"
-@MAKE@ test
-check_exit_value $? "Test cmake" || exit 1
+if [ -z "@SKIP_TESTS@" ]; then
+    echo "Run cmake tests"
+    @MAKE@ test
+    check_exit_value $? "Test cmake" || exit 1
+fi
 
 echo "Run package"
-@MAKE@ package
+./bin/cpack -D CMAKE_MAKE_PROGRAM=@MAKE_PROGRAM@
 check_exit_value $? "Package cmake" || exit 1
 
 echo "Create Tar.gz"
-./bin/cpack -G TGZ
+./bin/cpack  -D CMAKE_MAKE_PROGRAM=@MAKE_PROGRAM@ -G TGZ
 check_exit_value $? "Create TGZ" || exit 1
 
 # need to add an extra copy thing here
diff --git a/Utilities/Release/v60n177_aix_release.cmake b/Utilities/Release/v60n177_aix_release.cmake
index 3747871..8a15271 100644
--- a/Utilities/Release/v60n177_aix_release.cmake
+++ b/Utilities/Release/v60n177_aix_release.cmake
@@ -3,7 +3,7 @@ set(PROCESSORS 2)
 set(CVS_COMMAND /vol/local/bin/cvs)
 set(HOST "sshserv.centers.ihost.com" )
 set(EXTRA_HOP "rsh v60n177" )
-set(MAKE "make")
+set(MAKE_COMMAND "make")
 set(CC "xlc")
 set(CXX "xlC")
 set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release")