summaryrefslogtreecommitdiffstats
path: root/Help/manual/cmake-variables.7.rst
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-12-03 14:45:28 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-12-03 14:45:28 (GMT)
commita6b45087a1172655d2bbfebbbda3f66943ab6908 (patch)
tree316698a71ba8e970ef17853d2198ef4f1d745153 /Help/manual/cmake-variables.7.rst
parent1af0c41278567fa67e19d120b46058118f7a0d44 (diff)
parentc45b5ceb6684518d06a7e185ea620031e03b2efe (diff)
downloadCMake-a6b45087a1172655d2bbfebbbda3f66943ab6908.zip
CMake-a6b45087a1172655d2bbfebbbda3f66943ab6908.tar.gz
CMake-a6b45087a1172655d2bbfebbbda3f66943ab6908.tar.bz2
Merge topic 'cmake-toolchains-manual'
c45b5ce Help: Add cmake-toolchains.7 manual 3e3f8b4 Help: Document the CMAKE_FIND_ROOT_PATH* variables. 531c108 Help: Document the CMAKE_TOOLCHAIN_FILE.
Diffstat (limited to 'Help/manual/cmake-variables.7.rst')
-rw-r--r--Help/manual/cmake-variables.7.rst8
1 files changed, 7 insertions, 1 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 0f5f1ec..6756bb9 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -64,6 +64,7 @@ Variables that Provide Information
/variable/CMAKE_STANDARD_LIBRARIES
/variable/CMAKE_STATIC_LIBRARY_PREFIX
/variable/CMAKE_STATIC_LIBRARY_SUFFIX
+ /variable/CMAKE_TOOLCHAIN_FILE
/variable/CMAKE_TWEAK_VERSION
/variable/CMAKE_VERBOSE_MAKEFILE
/variable/CMAKE_VERSION
@@ -96,8 +97,13 @@ Variables that Change Behavior
/variable/CMAKE_SYSROOT
/variable/CMAKE_FIND_LIBRARY_PREFIXES
/variable/CMAKE_FIND_LIBRARY_SUFFIXES
- /variable/CMAKE_FIND_PACKAGE_WARN_NO_MODULE
/variable/CMAKE_FIND_NO_INSTALL_PREFIX
+ /variable/CMAKE_FIND_PACKAGE_WARN_NO_MODULE
+ /variable/CMAKE_FIND_ROOT_PATH
+ /variable/CMAKE_FIND_ROOT_PATH_MODE_INCLUDE
+ /variable/CMAKE_FIND_ROOT_PATH_MODE_LIBRARY
+ /variable/CMAKE_FIND_ROOT_PATH_MODE_PACKAGE
+ /variable/CMAKE_FIND_ROOT_PATH_MODE_PROGRAM
/variable/CMAKE_IGNORE_PATH
/variable/CMAKE_INCLUDE_PATH
/variable/CMAKE_INCLUDE_DIRECTORIES_BEFORE