diff --git a/Utilities/Release/release_cmake.cmake b/Utilities/Release/release_cmake.cmake index 20a6c3d44..005836ad7 100644 --- a/Utilities/Release/release_cmake.cmake +++ b/Utilities/Release/release_cmake.cmake @@ -11,9 +11,6 @@ endif(DEFINED EXTRA_COPY) if(NOT DEFINED CMAKE_RELEASE_DIRECTORY) set(CMAKE_RELEASE_DIRECTORY "~/CMakeReleaseDirectory") endif(NOT DEFINED CMAKE_RELEASE_DIRECTORY) -if(NOT DEFINED FINAL_PATH ) - set(FINAL_PATH ${CMAKE_RELEASE_DIRECTORY}/${CMAKE_VERSION}-build) -endif(NOT DEFINED FINAL_PATH ) if(NOT DEFINED SCRIPT_NAME) set(SCRIPT_NAME "${HOST}") endif(NOT DEFINED SCRIPT_NAME) @@ -43,6 +40,10 @@ else("${CMAKE_VERSION}" STREQUAL "CVS") set( CMAKE_CHECKOUT "${CVS_COMMAND} -q -z3 -d ${CVSROOT} export -r ${CMAKE_VERSION} ") endif("${CMAKE_VERSION}" STREQUAL "CVS") +if(NOT DEFINED FINAL_PATH ) + set(FINAL_PATH ${CMAKE_RELEASE_DIRECTORY}/${CMAKE_VERSION}-build) +endif(NOT DEFINED FINAL_PATH ) + if(NOT HOST) message(FATAL_ERROR "HOST must be specified with -DHOST=host") endif(NOT HOST) diff --git a/Utilities/Release/v60n177_aix_release.cmake b/Utilities/Release/v60n177_aix_release.cmake index 14f5a7c64..9ed42ad9a 100644 --- a/Utilities/Release/v60n177_aix_release.cmake +++ b/Utilities/Release/v60n177_aix_release.cmake @@ -1,5 +1,5 @@ set(CMAKE_RELEASE_DIRECTORY "/bench1/noibm34/CMakeReleaseDirectory" ) -set(FINAL_PATH /u/noibm34) +set(FINAL_PATH /u/noibm34/cmake-release) set(PROCESSORS 2) set(CVS_COMMAND /vol/local/bin/cvs) set(HOST "sshserv.centers.ihost.com" ) @@ -11,7 +11,11 @@ set(INITIAL_CACHE " CMAKE_BUILD_TYPE:STRING=Release CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE ") -set(EXTRA_COPY "mv *.sh ~ -mv *.gz ~") +set(EXTRA_COPY " +rm -rf ~/cmake-release +mkdir ~/cmake-release +mv *.sh ~/cmake-release +mv *.Z ~/cmake-release +mv *.gz ~/cmake-release") get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH) include(${path}/release_cmake.cmake)