Commit e7777cc5 authored by Brad King's avatar Brad King 💬 Committed by Kitware Robot
Browse files

Merge topic 'release-scripts-doc-dir'

6f7edb87 Utilities/Release: Install docs in unversioned directory (#15692)
7d891cde Utilities/Release: Refactor bootstrap argument construction
parents d3879499 6f7edb87
...@@ -54,6 +54,7 @@ mkdir \${name}-build && ...@@ -54,6 +54,7 @@ mkdir \${name}-build &&
cd \${name}-build && cd \${name}-build &&
\"${CMAKE_COMMAND}\" ../\${name}-src/Utilities/Sphinx \\ \"${CMAKE_COMMAND}\" ../\${name}-src/Utilities/Sphinx \\
-DCMAKE_INSTALL_PREFIX=\"\$inst/\" \\ -DCMAKE_INSTALL_PREFIX=\"\$inst/\" \\
-DCMAKE_DOC_DIR=doc/cmake \\
-DSPHINX_EXECUTABLE=\"${SPHINX_EXECUTABLE}\" \\ -DSPHINX_EXECUTABLE=\"${SPHINX_EXECUTABLE}\" \\
-DSPHINX_HTML=ON -DSPHINX_MAN=ON && -DSPHINX_HTML=ON -DSPHINX_MAN=ON &&
make install && make install &&
......
set(CMAKE_RELEASE_DIRECTORY "c:/cygwin/home/dashboard/CMakeReleaseCygwin") set(CMAKE_RELEASE_DIRECTORY "c:/cygwin/home/dashboard/CMakeReleaseCygwin")
set(PROCESSORS 9) set(PROCESSORS 9)
set(BOOTSTRAP_ARGS "")
set(MAKE_PROGRAM "make") set(MAKE_PROGRAM "make")
set(MAKE "${MAKE_PROGRAM} -j8") set(MAKE "${MAKE_PROGRAM} -j8")
set(HOST dash2win64) set(HOST dash2win64)
......
...@@ -8,6 +8,7 @@ set(CPACK_SOURCE_GENERATORS "ZIP") ...@@ -8,6 +8,7 @@ set(CPACK_SOURCE_GENERATORS "ZIP")
set(MAKE_PROGRAM "make") set(MAKE_PROGRAM "make")
set(MAKE "${MAKE_PROGRAM} -j8") set(MAKE "${MAKE_PROGRAM} -j8")
set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release
CMAKE_DOC_DIR:STRING=doc/cmake
CMAKE_USE_OPENSSL:BOOL=OFF CMAKE_USE_OPENSSL:BOOL=OFF
CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE
CMAKE_Fortran_COMPILER:FILEPATH=FALSE CMAKE_Fortran_COMPILER:FILEPATH=FALSE
......
set(PROCESSORS 2) set(PROCESSORS 2)
set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory) 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(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=/ --docdir=doc/cmake")
set(HOST dashmacmini2) set(HOST dashmacmini2)
set(MAKE_PROGRAM "make") set(MAKE_PROGRAM "make")
set(MAKE "${MAKE_PROGRAM} -j2") set(MAKE "${MAKE_PROGRAM} -j2")
......
set(PROCESSORS 4) set(PROCESSORS 4)
set(CMAKE_RELEASE_DIRECTORY /Users/kitware/CMakeReleaseDirectory) 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(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=/ --docdir=doc/cmake")
set(HOST dashmacmini5) set(HOST dashmacmini5)
set(MAKE_PROGRAM "make") set(MAKE_PROGRAM "make")
set(MAKE "${MAKE_PROGRAM} -j5") set(MAKE "${MAKE_PROGRAM} -j5")
......
set(PROCESSORS 4) set(PROCESSORS 4)
set(BOOTSTRAP_ARGS "--docdir=doc/cmake")
set(HOST linux64) set(HOST linux64)
set(MAKE_PROGRAM "make") set(MAKE_PROGRAM "make")
set(CC /opt/gcc-4.9.2/bin/gcc) set(CC /opt/gcc-4.9.2/bin/gcc)
......
set(PROCESSORS 1) set(PROCESSORS 1)
set(BOOTSTRAP_ARGS "--docdir=doc/cmake")
set(HOST magrathea) set(HOST magrathea)
set(MAKE_PROGRAM "make") set(MAKE_PROGRAM "make")
set(CC gcc332s) set(CC gcc332s)
......
...@@ -116,15 +116,9 @@ if [ ! -z "@CONFIGURE_WITH_CMAKE@" ]; then ...@@ -116,15 +116,9 @@ if [ ! -z "@CONFIGURE_WITH_CMAKE@" ]; then
@CMAKE_CONFIGURE_PATH@ ../@CMAKE_CREATE_VERSION@ @CMAKE_CONFIGURE_PATH@ ../@CMAKE_CREATE_VERSION@
check_exit_value $? "Configure cmake" || exit 1 check_exit_value $? "Configure cmake" || exit 1
else else
if [ -z "@INSTALL_PREFIX@" ]; then echo "Run cmake bootstrap @BOOTSTRAP_ARGS@ --parallel=@PROCESSORS@"
echo "Run cmake bootstrap --parallel=@PROCESSORS@" ../@CMAKE_CREATE_VERSION@/bootstrap @BOOTSTRAP_ARGS@ --parallel=@PROCESSORS@
../@CMAKE_CREATE_VERSION@/bootstrap --parallel=@PROCESSORS@ check_exit_value $? "Bootstrap cmake" || exit 1
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
fi fi
echo "Build cmake with @MAKE@" echo "Build cmake with @MAKE@"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment