summaryrefslogtreecommitdiffstats
path: root/Utilities
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2006-05-08 20:50:17 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2006-05-08 20:50:17 (GMT)
commit467bfbfc76d48b1d0c369fb6731e4e07315dc5e8 (patch)
tree6f848e754b008c81d179119e60261f5b202ba6c9 /Utilities
parent4d90438597f308a808cefdc3213e490f74dba3d4 (diff)
downloadCMake-467bfbfc76d48b1d0c369fb6731e4e07315dc5e8.zip
CMake-467bfbfc76d48b1d0c369fb6731e4e07315dc5e8.tar.gz
CMake-467bfbfc76d48b1d0c369fb6731e4e07315dc5e8.tar.bz2
ENH: change name to MAKE_COMMAND
Diffstat (limited to 'Utilities')
-rw-r--r--Utilities/Release/dashmacmini2_release.cmake4
-rw-r--r--Utilities/Release/destiny_release.cmake2
-rw-r--r--Utilities/Release/hythloth_release.cmake5
-rw-r--r--Utilities/Release/muse_release.cmake4
-rw-r--r--Utilities/Release/release_cmake.cmake8
-rw-r--r--Utilities/Release/v60n177_aix_release.cmake2
6 files changed, 13 insertions, 12 deletions
diff --git a/Utilities/Release/dashmacmini2_release.cmake b/Utilities/Release/dashmacmini2_release.cmake
index 192d9d6..860d241 100644
--- a/Utilities/Release/dashmacmini2_release.cmake
+++ b/Utilities/Release/dashmacmini2_release.cmake
@@ -1,7 +1,7 @@
set(PROCESSORS 2)
set(HOST dashmacmini2)
-set(MAKE_COMMAND "make")
-set(MAKE "${MAKE_COMMAND} -j2")
+set(MAKE_PROGRAM "make")
+set(MAKE "${MAKE_PROGRAM} -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 fff1a2b..1b5bd22 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_COMMAND "/usr/local/bin/gmake")
+set(MAKE_PROGRAM "/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 95766ed..d2f4ba5 100644
--- a/Utilities/Release/hythloth_release.cmake
+++ b/Utilities/Release/hythloth_release.cmake
@@ -1,9 +1,10 @@
set(PROCESSORS 2)
set(HOST hythloth)
-set(MAKE_COMMAND "make")
-set(MAKE "${MAKE_COMMAND} -j2")
+set(MAKE_PROGRAM "make")
+set(MAKE "${MAKE_PROGRAM} -j2")
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/muse_release.cmake b/Utilities/Release/muse_release.cmake
index b0429ba..52b79ec 100644
--- a/Utilities/Release/muse_release.cmake
+++ b/Utilities/Release/muse_release.cmake
@@ -1,8 +1,8 @@
set(CMAKE_RELEASE_DIRECTORY "/home/collab/itk/CMakeReleaseDirectory" )
set(PROCESSORS 20)
set(HOST muse)
-set(MAKE_COMMAND "gmake")
-set(MAKE "${MAKE_COMMAND} -j20")
+set(MAKE_PROGRAM "gmake")
+set(MAKE "${MAKE_PROGRAM} -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 ec1fbb3..fee2141 100644
--- a/Utilities/Release/release_cmake.cmake
+++ b/Utilities/Release/release_cmake.cmake
@@ -7,11 +7,11 @@ endif(DEFINED EXTRA_COPY)
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_PROGRAM)
+ message(FATAL_ERROR "MAKE_PROGRAM must be set")
+endif(NOT DEFINED MAKE_PROGRAM)
if(NOT DEFINED MAKE)
- set(MAKE "${MAKE_COMMAND}")
+ set(MAKE "${MAKE_PROGRAM}")
endif(NOT DEFINED MAKE)
if(NOT DEFINED RUN_SHELL)
set(RUN_SHELL "/bin/sh")
diff --git a/Utilities/Release/v60n177_aix_release.cmake b/Utilities/Release/v60n177_aix_release.cmake
index 8a15271..ac8256a 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_COMMAND "make")
+set(MAKE_PROGRAM "make")
set(CC "xlc")
set(CXX "xlC")
set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release")