summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'doc-user-interaction'Brad King2020-01-1410-1/+922
|\ | | | | | | | | | | | | | | | | | | | | bd681fee7a Help: Add guides for user interaction 6185265800 Utilities/Sphinx: Index guide-level documents for cross-referencing b1b7d01172 Utilities/Sphinx: Index document types only by top level directory Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Mateusz Łoskot <mateusz@loskot.net> Acked-by: Daan De Meyer <daan.j.demeyer@gmail.com> Merge-request: !4097
| * Help: Add guides for user interactionStephen Kelly2020-01-138-0/+917
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some prose to the documentation index page to guide readers to the major manuals and guides. Add a new "User Interaction Guide" to help the class of new user who wishes to build a project with CMake for the first time, such as after cloning a repo from a git repository. Add a new "Using Dependencies Guide" to help the class of new user who wishes to consume a SDK provided by a third party and needs a starting point. This is a different type of user to the user who wishes to create their own project from scratch (addressed by the `cmake-buildsystem(7)` manual) as each will encounter needs for information discovery in a different order.
| * Utilities/Sphinx: Index guide-level documents for cross-referencingBrad King2020-01-132-0/+4
| | | | | | | | | | | | Extend the change from commit d2fde94809 (Help: Add infrastructure for guide-level documentation, 2019-05-30, v3.16.0-rc1~531^2~4) to add support for cross-referencing and indexing the guides.
| * Utilities/Sphinx: Index document types only by top level directoryBrad King2020-01-131-1/+1
| | | | | | | | | | | | | | We use the convention `Help/<type>/<doc>` for indexing each document as an object of type `<type>`. Split the document name on the first slash rather than the last slash so that multi-level documents like `Help/guide/tutorial/index.rst` are indexed as their top-level type.
* | Merge branch 'release-3.16'Brad King2020-01-140-0/+0
|\ \
| * \ Merge topic 'FindMatlab-r2019' into release-3.16Brad King2020-01-141-0/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | edb6fe3b6a FindMatlab: add R2019a and R2019b MATLAB_VERSIONS_MAPPING Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4207
* | \ \ Merge topic 'FindMatlab-r2019'Brad King2020-01-141-0/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | edb6fe3b6a FindMatlab: add R2019a and R2019b MATLAB_VERSIONS_MAPPING Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4207
| * | | FindMatlab: add R2019a and R2019b MATLAB_VERSIONS_MAPPINGSilvio Traversaro2020-01-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reference for versions: https://www.mathworks.com/products/compiler/matlab-runtime.html Fixes: #20087
* | | | Merge branch 'release-3.16'Brad King2020-01-140-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge topic 'FindMatlab-only-CXX' into release-3.16Brad King2020-01-141-4/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b704d58f41 FindMatlab: in matlab_add_mex use the correct version file Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Patrik Huber <patrikhuber@gmail.com> Merge-request: !4206
* | \ \ \ Merge topic 'FindMatlab-only-CXX'Brad King2020-01-141-4/+13
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | b704d58f41 FindMatlab: in matlab_add_mex use the correct version file Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Patrik Huber <patrikhuber@gmail.com> Merge-request: !4206
| * | | | FindMatlab: in matlab_add_mex use the correct version fileSilvio Traversaro2020-01-131-4/+13
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this modification, the c_mexapi_version.c file was added to all mex libraries. However, if the C language was not enabled in the CMake project configuration, the c_mexapi_version.c file was ignored, creating linking errors in Windows and macOS. This commit ensures that in the case only the CXX languages is enabled, the correct version is passed. Fixes: #19382
* | | | Merge topic 'vs_populate_CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES'Brad King2020-01-142-27/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef4a66d694 CUDA: MSVC generators fill CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4179
| * | | | CUDA: MSVC generators fill CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIESRobert Maynard2020-01-102-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #18733 Correct an oversight where the MSVC generators didn't populate CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES.
* | | | | CMake Nightly Date StampKitware Robot2020-01-141-1/+1
| | | | |
* | | | | Merge topic 'target_compile_options-BEFORE-keyword'Brad King2020-01-1313-3/+92
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2678e31053 target_compile_options: ensure BEFORE keyword is handled in all scopes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4203
| * | | | | target_compile_options: ensure BEFORE keyword is handled in all scopesMarc Chevrier2020-01-1113-3/+92
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20200
* | | | | | Merge topic 'ninja-cross-build-disable'Brad King2020-01-1322-12/+148
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8032e202e Ninja Multi-Config: Make cross-config building opt-in Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4205
| * | | | | | Ninja Multi-Config: Make cross-config building opt-inKyle Edwards2020-01-1022-12/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many users will want to use the Ninja Multi-Config generator like a traditional Visual Studio-style multi-config generator, which doesn't mix configurations - custom commands are built using target executables of the same configuration the command is for. We do not want to force these people to generate an N*N build matrix when they only need N*1, especially if they have lots of targets. Add a new variable, CMAKE_NINJA_CROSS_CONFIG_ENABLE, to opt-in to the cross-config build matrix.
* | | | | | | Merge topic 'findmpi-preserve-include-order'Brad King2020-01-131-28/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5861c6d450 FindMPI: Preserve include order when extracting component directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4153
| * | | | | | | FindMPI: Preserve include order when extracting component directoriesChuck Atkins2020-01-101-28/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20098
* | | | | | | | Merge topic 'std-string'Brad King2020-01-133-40/+41
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 93e9d10c7f cmCacheManager: more members use std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4186
| * | | | | | | | cmCacheManager: more members use std::stringVitaly Stakhovsky2020-01-063-40/+41
| | | | | | | | |
* | | | | | | | | Merge topic 'refactoring-STL-erase_if'Brad King2020-01-1317-23/+387
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 968477517e Refactoring: suppress cmEraseIf in favor of cm::erase_if 348b60d19d STL support: add c++20 std::erase and std::erase_if functions Acked-by: Kitware Robot <kwrobot@kitware.com> Rejected-by: Leonid Pospelov <pospelovlm@yandex.ru> Merge-request: !4192
| * | | | | | | | | Refactoring: suppress cmEraseIf in favor of cm::erase_ifMarc Chevrier2020-01-097-21/+18
| | | | | | | | | |
| * | | | | | | | | STL support: add c++20 std::erase and std::erase_if functionsMarc Chevrier2020-01-0810-2/+369
| | | | | | | | | |
* | | | | | | | | | Merge topic 'out-of-dir-link-keyword'Brad King2020-01-138-8/+15
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 09721ca078 target_link_libraries: Fix out-of-dir calls with debug/optimized keywords c40229968c target_link_libraries: Add FIXME comment for out-of-dir genex list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4202
| * | | | | | | | | | target_link_libraries: Fix out-of-dir calls with debug/optimized keywordsBrad King2020-01-107-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit a1ad0a699b (target_link_libraries: Allow use with targets in other directories, 2018-09-07, v3.13.0-rc1~94^2) we added use of `<...>` to encode a directory id, but the closing `>` can incorrectly terminate a surrounding generator expression early. Encode the directory id using `(...)` instead. Fixes: #20202
| * | | | | | | | | | target_link_libraries: Add FIXME comment for out-of-dir genex listBrad King2020-01-102-0/+7
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #20204
* | | | | | | | | | Merge branch 'release-3.16'Brad King2020-01-130-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'fix-cpack-deb-description-file' into release-3.16Brad King2020-01-137-10/+28
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d491f34a5e CPack: Fix regression in DEB generator description Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4204
* | \ \ \ \ \ \ \ \ \ Merge topic 'fix-cpack-deb-description-file'Brad King2020-01-137-10/+28
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d491f34a5e CPack: Fix regression in DEB generator description Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4204
| * | | | | | | | | | CPack: Fix regression in DEB generator descriptionKyle Edwards2020-01-107-10/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20102
* | | | | | | | | | | Merge branch 'release-3.16'Brad King2020-01-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge topic 'objc-visibility-inlines' into release-3.16Brad King2020-01-134-11/+10
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7347e2f830 ObjC: Add VISIBLITY_INLINES_HIDDEN support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4199
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'objc-visibility-inlines'Brad King2020-01-134-11/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7347e2f830 ObjC: Add VISIBLITY_INLINES_HIDDEN support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4199
| * | | | | | | | | | | ObjC: Add VISIBLITY_INLINES_HIDDEN supportCristian Adam2020-01-104-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20193
* | | | | | | | | | | | Merge branch 'release-3.16'Brad King2020-01-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge topic 'macOS-Xcode-11-frameworks' into release-3.16Brad King2020-01-132-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fcde42751a FindPython: ensure new Xcode framework for Python3 is detected dd7b741b81 macOS: Add support for new Xcode 11 frameworks directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4198
* | | | | | | | | | | | Merge topic 'macOS-Xcode-11-frameworks'Brad King2020-01-132-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | / | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fcde42751a FindPython: ensure new Xcode framework for Python3 is detected dd7b741b81 macOS: Add support for new Xcode 11 frameworks directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4198
| * | | | | | | | | | FindPython: ensure new Xcode framework for Python3 is detectedMarc Chevrier2020-01-101-0/+3
| | | | | | | | | | |
| * | | | | | | | | | macOS: Add support for new Xcode 11 frameworks directoryMarc Chevrier2020-01-101-0/+4
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CMAKE_SYSTEM_FRAMEWORK_PATH with new Xcode 11 frameworks directory
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-01-131-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-01-121-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-01-111-1/+1
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge topic 'nvcc-options-version'Brad King2020-01-101-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7560c68f2c CUDA: Fix compiler option version checks for nvcc 10.2.19 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4161
| * | | | | | | | | CUDA: Fix compiler option version checks for nvcc 10.2.19Raul Tambre2020-01-031-2/+2
| | | | | | | | | |
* | | | | | | | | | Merge topic 'cpack_nsis_avoid_delay'Brad King2020-01-101-9/+11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9d2816544e CPack/NSIS: Also preload the "UserInfo.dll" plugin 13567bd186 CPack/NSIS: Avoid "setup loading" screen by fixing template order Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4171
| * | | | | | | | | | CPack/NSIS: Also preload the "UserInfo.dll" pluginPatrick Storz2020-01-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is currently used to provide UserInfo::GetName and UserInfo::GetAccountType functions.
| * | | | | | | | | | CPack/NSIS: Avoid "setup loading" screen by fixing template orderPatrick Storz2020-01-041-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NSIS packages files (including those required by the installer itslef) in the order in which they're mentioned in the .nsi file. If solid compression is used, the installer might need to extract large parts of the archive to be able to even start the setup program ("Please wait while setup is loading..."). Avoid this by moving component installation towards the end of the template file.