kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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`.
This commit is contained in:
Brad King 2015-09-02 14:15:59 -04:00
parent 7d891cde02
commit 6f7edb87ea
6 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Utilities/Release/create-cmake-release.cmake
View File

@ -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 &&

1
Utilities/Release/dash2win64_release.cmake
View File

@ -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

2
Utilities/Release/dashmacmini2_release.cmake
View File

@ -1,7 +1,7 @@
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(BOOTSTRAP_ARGS "--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")

2
Utilities/Release/dashmacmini5_release.cmake
View File

@ -1,7 +1,7 @@
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(BOOTSTRAP_ARGS "--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")

2
Utilities/Release/linux64_release.cmake
View File

@ -1,5 +1,5 @@
set(PROCESSORS 4) set(PROCESSORS 4)
set(BOOTSTRAP_ARGS "") 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)

2
Utilities/Release/magrathea_release.cmake
View File

@ -1,5 +1,5 @@
set(PROCESSORS 1) set(PROCESSORS 1)
set(BOOTSTRAP_ARGS "") 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)