diff options
| author | Brad King <brad.king@kitware.com> | 2015-09-02 18:11:57 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-09-02 18:11:57 (GMT) |
| commit | 7d891cde021bf941bc79c39076531cb1889c2a27 (patch) | |
| tree | 368a121c7bdfec12eea1837c28d1bd0c492609e9 /Utilities/Release/release_cmake.sh.in | |
| parent | 72c11e590273d100c49f472afc3a7569b233ff00 (diff) | |
| download | CMake-7d891cde021bf941bc79c39076531cb1889c2a27.zip CMake-7d891cde021bf941bc79c39076531cb1889c2a27.tar.gz CMake-7d891cde021bf941bc79c39076531cb1889c2a27.tar.bz2 | |
Utilities/Release: Refactor bootstrap argument construction
Pass needed bootstrap arguments directly instead of constructing them
from various conditions.
Diffstat (limited to 'Utilities/Release/release_cmake.sh.in')
| -rwxr-xr-x | Utilities/Release/release_cmake.sh.in | 12 |
1 files changed, 3 insertions, 9 deletions
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@" |