Utilities/Release: Refactor bootstrap argument construction
Pass needed bootstrap arguments directly instead of constructing them from various conditions.
This commit is contained in:
parent
72c11e5902
commit
7d891cde02
|
@ -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)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
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(BOOTSTRAP_ARGS "--prefix=/")
|
||||
set(HOST dashmacmini2)
|
||||
set(MAKE_PROGRAM "make")
|
||||
set(MAKE "${MAKE_PROGRAM} -j2")
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
set(PROCESSORS 4)
|
||||
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(BOOTSTRAP_ARGS "--prefix=/")
|
||||
set(HOST dashmacmini5)
|
||||
set(MAKE_PROGRAM "make")
|
||||
set(MAKE "${MAKE_PROGRAM} -j5")
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
set(PROCESSORS 1)
|
||||
set(BOOTSTRAP_ARGS "")
|
||||
set(HOST magrathea)
|
||||
set(MAKE_PROGRAM "make")
|
||||
set(CC gcc332s)
|
||||
|
|
|
@ -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@"
|
||||
|
|
Loading…
Reference in New Issue