From 7d891cde021bf941bc79c39076531cb1889c2a27 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 2 Sep 2015 14:11:57 -0400 Subject: Utilities/Release: Refactor bootstrap argument construction Pass needed bootstrap arguments directly instead of constructing them from various conditions. --- Utilities/Release/dash2win64_cygwin.cmake | 1 + Utilities/Release/dashmacmini2_release.cmake | 2 +- Utilities/Release/dashmacmini5_release.cmake | 2 +- Utilities/Release/linux64_release.cmake | 1 + Utilities/Release/magrathea_release.cmake | 1 + Utilities/Release/release_cmake.sh.in | 12 +++--------- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Utilities/Release/dash2win64_cygwin.cmake b/Utilities/Release/dash2win64_cygwin.cmake index d15915a..c0cd761 100644 --- a/Utilities/Release/dash2win64_cygwin.cmake +++ b/Utilities/Release/dash2win64_cygwin.cmake @@ -1,5 +1,6 @@ set(CMAKE_RELEASE_DIRECTORY "c:/cygwin/home/dashboard/CMakeReleaseCygwin") set(PROCESSORS 9) +set(BOOTSTRAP_ARGS "") set(MAKE_PROGRAM "make") set(MAKE "${MAKE_PROGRAM} -j8") set(HOST dash2win64) diff --git a/Utilities/Release/dashmacmini2_release.cmake b/Utilities/Release/dashmacmini2_release.cmake index 01f5b8b..1f52150 100644 --- a/Utilities/Release/dashmacmini2_release.cmake +++ b/Utilities/Release/dashmacmini2_release.cmake @@ -1,7 +1,7 @@ set(PROCESSORS 2) set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory) set(USER_OVERRIDE "set(CMAKE_CXX_LINK_EXECUTABLE \\\"gcc -o -shared-libgcc -lstdc++-static\\\")") -set(INSTALL_PREFIX /) +set(BOOTSTRAP_ARGS "--prefix=/") set(HOST dashmacmini2) set(MAKE_PROGRAM "make") set(MAKE "${MAKE_PROGRAM} -j2") diff --git a/Utilities/Release/dashmacmini5_release.cmake b/Utilities/Release/dashmacmini5_release.cmake index be1dfa9..3025594 100644 --- a/Utilities/Release/dashmacmini5_release.cmake +++ b/Utilities/Release/dashmacmini5_release.cmake @@ -1,7 +1,7 @@ set(PROCESSORS 4) set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory) # set(USER_OVERRIDE "set(CMAKE_CXX_LINK_EXECUTABLE \\\"gcc -o -shared-libgcc -lstdc++-static\\\")") -set(INSTALL_PREFIX /) +set(BOOTSTRAP_ARGS "--prefix=/") set(HOST dashmacmini5) set(MAKE_PROGRAM "make") set(MAKE "${MAKE_PROGRAM} -j5") diff --git a/Utilities/Release/linux64_release.cmake b/Utilities/Release/linux64_release.cmake index 25da00a..0de49f0 100644 --- a/Utilities/Release/linux64_release.cmake +++ b/Utilities/Release/linux64_release.cmake @@ -1,4 +1,5 @@ set(PROCESSORS 4) +set(BOOTSTRAP_ARGS "") set(HOST linux64) set(MAKE_PROGRAM "make") set(CC /opt/gcc-4.9.2/bin/gcc) diff --git a/Utilities/Release/magrathea_release.cmake b/Utilities/Release/magrathea_release.cmake index b031eb8..03fb996 100644 --- a/Utilities/Release/magrathea_release.cmake +++ b/Utilities/Release/magrathea_release.cmake @@ -1,4 +1,5 @@ set(PROCESSORS 1) +set(BOOTSTRAP_ARGS "") set(HOST magrathea) set(MAKE_PROGRAM "make") set(CC gcc332s) diff --git a/Utilities/Release/release_cmake.sh.in b/Utilities/Release/release_cmake.sh.in index 76fdb3a..06e720f 100755 --- a/Utilities/Release/release_cmake.sh.in +++ b/Utilities/Release/release_cmake.sh.in @@ -116,15 +116,9 @@ if [ ! -z "@CONFIGURE_WITH_CMAKE@" ]; then @CMAKE_CONFIGURE_PATH@ ../@CMAKE_CREATE_VERSION@ check_exit_value $? "Configure cmake" || exit 1 else - if [ -z "@INSTALL_PREFIX@" ]; then - echo "Run cmake bootstrap --parallel=@PROCESSORS@" - ../@CMAKE_CREATE_VERSION@/bootstrap --parallel=@PROCESSORS@ - check_exit_value $? "Bootstrap cmake" || exit 1 - else - echo "Run cmake bootstrap --prefix=@INSTALL_PREFIX@ --parallel=@PROCESSORS@" - ../@CMAKE_CREATE_VERSION@/bootstrap --prefix=@INSTALL_PREFIX@ --parallel=@PROCESSORS@ - check_exit_value $? "Bootstrap cmake" || exit 1 - fi + echo "Run cmake bootstrap @BOOTSTRAP_ARGS@ --parallel=@PROCESSORS@" + ../@CMAKE_CREATE_VERSION@/bootstrap @BOOTSTRAP_ARGS@ --parallel=@PROCESSORS@ + check_exit_value $? "Bootstrap cmake" || exit 1 fi echo "Build cmake with @MAKE@" -- cgit v0.12