diff options
author | Brad King <brad.king@kitware.com> | 2013-11-19 17:41:57 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-11-19 17:41:57 (GMT) |
commit | 46ec48c93d2d84cf79c8704c370e24d47a7536a5 (patch) | |
tree | 83dae82226242d9f31dfc8f77edf791d34cc65b4 /Help/manual | |
parent | 1da77bf1ee4f3ba315ebb00da2eaeac474614cad (diff) | |
parent | 7cd65c97fabd9f3249739a81dd1260a1e0b59ee1 (diff) | |
download | CMake-46ec48c93d2d84cf79c8704c370e24d47a7536a5.zip CMake-46ec48c93d2d84cf79c8704c370e24d47a7536a5.tar.gz CMake-46ec48c93d2d84cf79c8704c370e24d47a7536a5.tar.bz2 |
Merge topic 'cross-compiling-toolchain-variables'
7cd65c9 Add CMAKE_SYSROOT variable to set --sysroot when cross compiling.
5096967 Allow toolchain files to specify an external toolchain.
76552d5 Add compiler target compile options.
f41ecd1 CMakeDetermineCompilerId: Look for internal file only on host
Diffstat (limited to 'Help/manual')
-rw-r--r-- | Help/manual/cmake-variables.7.rst | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst index 59e8064..dd82b40 100644 --- a/Help/manual/cmake-variables.7.rst +++ b/Help/manual/cmake-variables.7.rst @@ -91,6 +91,7 @@ Variables that Change Behavior /variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName /variable/CMAKE_ERROR_DEPRECATED /variable/CMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION + /variable/CMAKE_SYSROOT /variable/CMAKE_FIND_LIBRARY_PREFIXES /variable/CMAKE_FIND_LIBRARY_SUFFIXES /variable/CMAKE_FIND_PACKAGE_WARN_NO_MODULE @@ -234,6 +235,8 @@ Variables for Languages /variable/CMAKE_LANG_COMPILER_ID /variable/CMAKE_LANG_COMPILER_LOADED /variable/CMAKE_LANG_COMPILER + /variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN + /variable/CMAKE_LANG_COMPILER_TARGET /variable/CMAKE_LANG_COMPILER_VERSION /variable/CMAKE_LANG_CREATE_SHARED_LIBRARY /variable/CMAKE_LANG_CREATE_SHARED_MODULE |