diff options
author | Brad King <brad.king@kitware.com> | 2015-09-02 14:15:59 -0400 |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2015-09-02 14:15:59 -0400 |
commit | 6f7edb87ea07ee50874728cceb8a01648ab16964 (patch) | |
tree | bd47ef3290e87cbcec5ab5929e5c7451a464f9fa /Utilities | |
parent | 7d891cde021bf941bc79c39076531cb1889c2a27 (diff) | |
download | cmake-6f7edb87ea07ee50874728cceb8a01648ab16964.tar.gz |
Utilities/Release: Install docs in unversioned directory (#15692)
Our upstream-built release tarballs already contain many unversioned
paths and so will never overlap with another version of CMake in the
same installation prefix. Therefore we do not need a versioned name for
the documentation directory. Configure our release binaries to place
the documentation in an unversioned directory so that one can use the
same path to refer to the documentation locally even after updating
CMake. For example, on OS X one may see the documentation in
`/Applications/CMake.app/Contents/doc/cmake/html/index.html`.
Diffstat (limited to 'Utilities')
-rw-r--r-- | Utilities/Release/create-cmake-release.cmake | 1 | ||||
-rw-r--r-- | Utilities/Release/dash2win64_release.cmake | 1 | ||||
-rw-r--r-- | Utilities/Release/dashmacmini2_release.cmake | 2 | ||||
-rw-r--r-- | Utilities/Release/dashmacmini5_release.cmake | 2 | ||||
-rw-r--r-- | Utilities/Release/linux64_release.cmake | 2 | ||||
-rw-r--r-- | Utilities/Release/magrathea_release.cmake | 2 |
6 files changed, 6 insertions, 4 deletions
diff --git a/Utilities/Release/create-cmake-release.cmake b/Utilities/Release/create-cmake-release.cmake index 4b93e6e301..4cfa2ed93d 100644 --- a/Utilities/Release/create-cmake-release.cmake +++ b/Utilities/Release/create-cmake-release.cmake @@ -54,6 +54,7 @@ mkdir \${name}-build && cd \${name}-build && \"${CMAKE_COMMAND}\" ../\${name}-src/Utilities/Sphinx \\ -DCMAKE_INSTALL_PREFIX=\"\$inst/\" \\ + -DCMAKE_DOC_DIR=doc/cmake \\ -DSPHINX_EXECUTABLE=\"${SPHINX_EXECUTABLE}\" \\ -DSPHINX_HTML=ON -DSPHINX_MAN=ON && make install && diff --git a/Utilities/Release/dash2win64_release.cmake b/Utilities/Release/dash2win64_release.cmake index 3ea895aca3..25acc17bfb 100644 --- a/Utilities/Release/dash2win64_release.cmake +++ b/Utilities/Release/dash2win64_release.cmake @@ -8,6 +8,7 @@ set(CPACK_SOURCE_GENERATORS "ZIP") set(MAKE_PROGRAM "make") set(MAKE "${MAKE_PROGRAM} -j8") set(INITIAL_CACHE "CMAKE_BUILD_TYPE:STRING=Release +CMAKE_DOC_DIR:STRING=doc/cmake CMAKE_USE_OPENSSL:BOOL=OFF CMAKE_SKIP_BOOTSTRAP_TEST:STRING=TRUE CMAKE_Fortran_COMPILER:FILEPATH=FALSE diff --git a/Utilities/Release/dashmacmini2_release.cmake b/Utilities/Release/dashmacmini2_release.cmake index 1f52150633..cd4c5a1e3c 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 <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -shared-libgcc -lstdc++-static\\\")") -set(BOOTSTRAP_ARGS "--prefix=/") +set(BOOTSTRAP_ARGS "--prefix=/ --docdir=doc/cmake") 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 30255946df..b147013a77 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 <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES> -shared-libgcc -lstdc++-static\\\")") -set(BOOTSTRAP_ARGS "--prefix=/") +set(BOOTSTRAP_ARGS "--prefix=/ --docdir=doc/cmake") 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 0de49f0bd1..81442e72b9 100644 --- a/Utilities/Release/linux64_release.cmake +++ b/Utilities/Release/linux64_release.cmake @@ -1,5 +1,5 @@ set(PROCESSORS 4) -set(BOOTSTRAP_ARGS "") +set(BOOTSTRAP_ARGS "--docdir=doc/cmake") 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 03fb9969dc..0634ddadfc 100644 --- a/Utilities/Release/magrathea_release.cmake +++ b/Utilities/Release/magrathea_release.cmake @@ -1,5 +1,5 @@ set(PROCESSORS 1) -set(BOOTSTRAP_ARGS "") +set(BOOTSTRAP_ARGS "--docdir=doc/cmake") set(HOST magrathea) set(MAKE_PROGRAM "make") set(CC gcc332s) |