diff options
| author | Chad Versace <chad.versace@linux.intel.com> | 2012-10-12 15:38:12 -0700 |
|---|---|---|
| committer | Chad Versace <chad.versace@linux.intel.com> | 2012-10-12 17:17:21 -0700 |
| commit | 2b085f956b7827fc67ea4415ebcbb50d47b85705 (patch) | |
| tree | bd02da051c469ffbec604889d3b95727a2f5008e /doc | |
| parent | 296dfaae4d138debf77e4a6769c770d5fb45bc4c (diff) | |
cmake: Use the GNUInstallDirs module
This adds CMake options that are familiar to autoconf users, such as
CMAKE_INSTALL_LIBDIR. Portage's cmake.eclass expects these variables
to be supported.
This replaces the following CMake options. If the user specifies any of
the old options, then emit a fatal error.
waffle_install_includedir -> CMAKE_INSTALL_INCLUDEDIR
waffle_install_libdir -> CMAKE_INSTALL_LIBDIR
waffle_install_docdir -> CMAKE_INSTALL_DOCDIR
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | doc/building.txt | 37 |
2 files changed, 21 insertions, 20 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 3aae252..9b414f0 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,7 +1,7 @@ install(FILES "${CMAKE_SOURCE_DIR}/README.txt" "${CMAKE_SOURCE_DIR}/LICENSE.txt" - DESTINATION "${waffle_install_docdir}") + DESTINATION "${CMAKE_INSTALL_FULL_DOCDIR}") install(DIRECTORY "${CMAKE_SOURCE_DIR}/doc/release-notes" - DESTINATION "${waffle_install_docdir}" + DESTINATION "${CMAKE_INSTALL_FULL_DOCDIR}" FILES_MATCHING PATTERN "waffle-${waffle_major_version}.${waffle_minor_version}.*.txt") diff --git a/doc/building.txt b/doc/building.txt index 6758405..0819fed 100644 --- a/doc/building.txt +++ b/doc/building.txt @@ -30,6 +30,25 @@ CMake builtin options: LIBRARY_PATH and CFLAGS. You need to set some of the options below to get that behavior. + - CMAKE_INSTALL_PREFIX + [default=/usr/local] + Equivalent to autoconf's --prefix. + + - CMAKE_INSTALL_INCLUDEDIR + [default=include] + Equivalent to autoconf's --includedir. + Relative paths are interpreted relative to CMAKE_INSTALL_PREFIX. + + - CMAKE_INSTALL_LIBDIR + [default=lib or lib64, system-dependent] + Equivalent to autoconf's --libdir. + Relative paths are interpreted relative to CMAKE_INSTALL_PREFIX. + + - CMAKE_INSTALL_DOCDIR + [default=${CMAKE_INSTALL_DATAROOTDIR}/doc/waffle-${MAJOR_VERSION}] + Equivalent to autoconf's --docdir. + Relative paths are interpreted relative to CMAKE_INSTALL_PREFIX. + - CMAKE_BUILD_TYPE [default=?; choices=debug,release] This affects compilation flags. @@ -50,10 +69,6 @@ CMake builtin options: A semicolon-separated list of directories in which to search for libraries. - - CMAKE_INSTALL_PREFIX - [default=/usr/local] - Equivalent to autoconf's --prefix. - Platform options; - waffle_has_glx @@ -68,20 +83,6 @@ Platform options; [default=0] [choices=0,1] Build Waffle with support for X11/EGL. -Install options: - - - waffle_install_includedir - [default=${CMAKE_INSTALL_PREFIX}/include] - Directory where libraries will be instaled. - - - waffle_install_libdir - [default=${CMAKE_INSTALL_PREFIX}/lib] - Directory where libraries will be installed. - - - waffle_install_docdir - [default=${CMAKE_INSTALL_PREFIX}/share/doc/waffle-MAJOR] - Directory where documentation will be instaled. - Miscellaneous options: - waffle_build_tests |