diff options
| author | Brad King <brad.king@kitware.com> | 2017-03-09 16:08:06 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-03-09 16:08:11 (GMT) |
| commit | c4f9d104269938d8111030a05268b19a0f493098 (patch) | |
| tree | 155bdfc09b1ee0312206fc30f72d21834b2d9c36 /Help/manual | |
| parent | 31f3531856ab8ee0cdeaf427224b51abd7714ccc (diff) | |
| parent | d9bdcf34efa79dcdea4ded8e90b80a55db69fbf6 (diff) | |
| download | CMake-c4f9d104269938d8111030a05268b19a0f493098.zip CMake-c4f9d104269938d8111030a05268b19a0f493098.tar.gz CMake-c4f9d104269938d8111030a05268b19a0f493098.tar.bz2 | |
Merge topic 'master'
d9bdcf34 Tests: Add x32 tests to test suite
5b6d354f Help: Add notes for topic 'x32-abi'
bed9c73d Modules: Add x32-abi support to hard-coded paths
462cf254 Add support for x32-abi
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !532
Diffstat (limited to 'Help/manual')
| -rw-r--r-- | Help/manual/cmake-properties.7.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst index 5bd6365..2157ba5 100644 --- a/Help/manual/cmake-properties.7.rst +++ b/Help/manual/cmake-properties.7.rst @@ -26,6 +26,7 @@ Properties of Global Scope /prop_gbl/ENABLED_LANGUAGES /prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS /prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS + /prop_gbl/FIND_LIBRARY_USE_LIBX32_PATHS /prop_gbl/FIND_LIBRARY_USE_OPENBSD_VERSIONING /prop_gbl/GLOBAL_DEPENDS_DEBUG_MODE /prop_gbl/GLOBAL_DEPENDS_NO_CYCLES |