diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2010-04-20 19:03:20 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2010-04-20 19:03:20 (GMT) |
| commit | 7849674012189c4337d05dbc5b2926d3c12951fe (patch) | |
| tree | 780743858e16a132e51b883d11244705c8ad02a4 | |
| parent | 22e9f2d0abf4ca7ff0b8551ba1be2ce6a3530336 (diff) | |
| download | CMake-7849674012189c4337d05dbc5b2926d3c12951fe.zip CMake-7849674012189c4337d05dbc5b2926d3c12951fe.tar.gz CMake-7849674012189c4337d05dbc5b2926d3c12951fe.tar.bz2 | |
Fix release scripts.
| -rw-r--r-- | Utilities/Release/dash2win64_release.cmake | 2 | ||||
| -rw-r--r-- | Utilities/Release/dashmacmini2_release.cmake | 2 | ||||
| -rwxr-xr-x | Utilities/Release/release_cmake.sh.in | 7 | ||||
| -rw-r--r-- | Utilities/Release/v20n250_aix_release.cmake | 4 |
4 files changed, 12 insertions, 3 deletions
diff --git a/Utilities/Release/dash2win64_release.cmake b/Utilities/Release/dash2win64_release.cmake index 5bec13a..fcf67bc 100644 --- a/Utilities/Release/dash2win64_release.cmake +++ b/Utilities/Release/dash2win64_release.cmake @@ -1,6 +1,6 @@ set(CMAKE_RELEASE_DIRECTORY "c:/cygwin/home/dashboard/CMakeReleaseDirectory") set(CONFIGURE_WITH_CMAKE TRUE) -set(CMAKE_CONFIGURE_PATH "c:/Program\\ Files\\ \\(x86\\)/CMake\\ 2.6/bin/cmake.exe") +set(CMAKE_CONFIGURE_PATH "c:/Program\\ Files\\ \\(x86\\)/CMake\\ 2.8/bin/cmake.exe") set(PROCESSORS 8) set(HOST dash2win64) set(CPACK_BINARY_GENERATORS "NSIS ZIP") diff --git a/Utilities/Release/dashmacmini2_release.cmake b/Utilities/Release/dashmacmini2_release.cmake index 645557b..12bfa6a 100644 --- a/Utilities/Release/dashmacmini2_release.cmake +++ b/Utilities/Release/dashmacmini2_release.cmake @@ -1,4 +1,6 @@ set(PROCESSORS 2) +set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory) +set(USER_OVERRIDE "set(CMAKE_CXX_LINK_EXECUTABLE \\\"gcc <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -shared-libgcc -lstdc++-static\\\")") set(INSTALL_PREFIX /) set(HOST dashmacmini2) set(MAKE_PROGRAM "make") diff --git a/Utilities/Release/release_cmake.sh.in b/Utilities/Release/release_cmake.sh.in index ee56f39..b2ca348 100755 --- a/Utilities/Release/release_cmake.sh.in +++ b/Utilities/Release/release_cmake.sh.in @@ -69,6 +69,13 @@ echo "Create initial cache" echo "@INITIAL_CACHE@" > @CMAKE_RELEASE_DIRECTORY@/@CMAKE_CREATE_VERSION@-build/CMakeCache.txt check_exit_value $? "Create initial cache" || exit 1 +# create a user override file user.txt if USER_OVERRIDE is set, +# and append the cache variable to the cache +if [ ! -z "@USER_OVERRIDE@" ]; then + echo "@USER_OVERRIDE@" > @CMAKE_RELEASE_DIRECTORY@/@CMAKE_CREATE_VERSION@-build/user.txt + echo "CMAKE_USER_MAKE_RULES_OVERRIDE:FILEPATH=@CMAKE_RELEASE_DIRECTORY@/@CMAKE_CREATE_VERSION@-build/user.txt" >> @CMAKE_RELEASE_DIRECTORY@/@CMAKE_CREATE_VERSION@-build/CMakeCache.txt +fi + echo "Checkout the source for @CMAKE_CREATE_VERSION@" cd @CMAKE_RELEASE_DIRECTORY@ if [ ! -z "@GIT_COMMAND@" ]; then diff --git a/Utilities/Release/v20n250_aix_release.cmake b/Utilities/Release/v20n250_aix_release.cmake index 876c84d..88eb8d0 100644 --- a/Utilities/Release/v20n250_aix_release.cmake +++ b/Utilities/Release/v20n250_aix_release.cmake @@ -5,8 +5,8 @@ set(CVS_COMMAND /vol/local/bin/cvs) set(HOST "sshserv.centers.ihost.com" ) set(EXTRA_HOP "rsh v20n250" ) set(MAKE_PROGRAM "make") -set(CC "xlc") -set(CXX "xlC") +set(CC "xlc_r") +set(CXX "xlC_r") set(FC "xlf") set(INITIAL_CACHE " CMAKE_BUILD_TYPE:STRING=Release |