summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Merge topic 'unity-lang-filename' into release-3.16Brad King2020-01-1512-16/+16
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 274a6f3699 Unity Build: include language in generated source file name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4223
* | \ \ \ \ \ \ \ \ Merge topic 'unity-lang-filename'Brad King2020-01-1512-16/+16
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 274a6f3699 Unity Build: include language in generated source file name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4223
| * | | | | | | | | Unity Build: include language in generated source file nameCristian Adam2020-01-1412-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20206
* | | | | | | | | | Merge branch 'release-3.16'Brad King2020-01-150-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'python39' into release-3.16Brad King2020-01-153-3/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6474214b3 FindPython: Add support for version 3.9 Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Marc Chevrier <marc.chevrier@gmail.com> Acked-by: Björn Esser <besser82@fedoraproject.org> Merge-request: !4225
* | | | | | | | | | Merge topic 'python39'Brad King2020-01-153-3/+3
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6474214b3 FindPython: Add support for version 3.9 Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Marc Chevrier <marc.chevrier@gmail.com> Acked-by: Björn Esser <besser82@fedoraproject.org> Merge-request: !4225
| * | | | | | | | | FindPython: Add support for version 3.9Miro Hrončok2020-01-143-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Development versions of Python 3.9.0 are already out there. See PEP 596 -- Python 3.9 Release Schedule: https://www.python.org/dev/peps/pep-0596/
* | | | | | | | | | Merge topic 'ctest-timeout-on-pipe'Brad King2020-01-158-3/+90
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1976cd1f2 CTest: Fix timeout when grandchild keeps pipes open 2f5eb1800b Tests: Add RunCMake.CTestTimeout test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4217
| * | | | | | | | | | CTest: Fix timeout when grandchild keeps pipes openBrad King2020-01-144-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a test's process creates its own child and exits, the grandchild may keep pipes open. Fix CTest logic to correctly timeout if the grandchild does not exit and close the pipes before the timeout expires. This was broken by commit b5e21d7d2e (CTest: Re-implement test process handling using libuv, 2017-12-10, v3.11.0-rc1~117^2) which added an unnecessary condition to the timeout handling. Fixes: #20116
| * | | | | | | | | | Tests: Add RunCMake.CTestTimeout testBrad King2020-01-146-0/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test will consolidate CTest timeout-related tests.
* | | | | | | | | | | Merge topic 'cmake-self-rpath'Brad King2020-01-151-37/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d92bf9e84f Enable RPATH for CMake's own binaries by default Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4222
| * | | | | | | | | | | Enable RPATH for CMake's own binaries by defaultBrad King2020-01-141-37/+7
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reconcile the changes made by: * commit ae62f66033 (ENH: CMake does not need RPATHs at all for its own executables, 2006-03-01, v2.4.0~380) * commit a056cffc5b (COMP: enable RPATH if any of the CMAKE_USE_SYSTEM_XXX variables is enabled, 2007-08-28, v2.6.0~1183) * commit c0108d1e07 (COMP: use RPATH is building QtDialog and the Qt libs are not in /lib or /usr/lib, 2007-11-05, v2.6.0~915) The overall goal of those changes was to get the RPATH set for external libraries when needed and also to avoid re-linking or other RPATH editing on installation. We can use a simpler approach to satisfy both goals: always use RPATH entries for libraries found externally. If there are no such libraries we will get no RPATH. If there are such libraries that are not in standard paths we will get a RPATH that points at them. This will work for running either from the build tree or the install tree, so we can use the same for both to avoid editing on installation. Fixes: #20185
* | | | | | | | | | | Merge topic 'avoid-getcwd'Brad King2020-01-155-5/+10
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 22f38c0d6b cmake: avoid getcwd in `CollapseFullPath` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4218
| * | | | | | | | | | | cmake: avoid getcwd in `CollapseFullPath`Tim Blechmann2020-01-145-5/+10
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `CollapseFullPath` calls getcwd, which is a rather expensive system call. we can replace it with `GetHomeOutputDirectory()` to save us from the calling overhead
* | | | | | | | | | | Merge topic 'modernize-memory-management'Brad King2020-01-1517-209/+177
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 328f586be7 cmAlgorithms.h: remove obsolete helpers f466cea3c9 cmMakefile: modernize memory management Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4215
| * | | | | | | | | | cmAlgorithms.h: remove obsolete helpersMarc Chevrier2020-01-141-41/+0
| | | | | | | | | | |
| * | | | | | | | | | cmMakefile: modernize memory managementMarc Chevrier2020-01-1416-168/+177
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-01-151-1/+1
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge topic 'ninja_multi_config_support_cuda'Kyle Edwards2020-01-149-8/+145
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c7ac13e8ed CUDA: Mult-Config Ninja generator now supports CUDA Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4187
| * | | | | | | | | CUDA: Mult-Config Ninja generator now supports CUDARobert Maynard2020-01-139-8/+145
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'tutorial'Brad King2020-01-1422-254/+242
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7d25358a0 Tutorial: Add the PRIVATE keyword to target_link_libraries command cf2afb1065 Tutorial: Remove 'Consumer' example 77b515f3eb Tutorial: Improve "MultiPackage" example 3a510a47b0 Tutorial: Add links to relevant CMake documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4113
| * | | | | | | | | Tutorial: Add the PRIVATE keyword to target_link_libraries commandBetsy McPhail2020-01-103-3/+3
| | | | | | | | | |
| * | | | | | | | | Tutorial: Remove 'Consumer' exampleBetsy McPhail2020-01-103-76/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This example was incomplete and did not follow the format of the tutorial.
| * | | | | | | | | Tutorial: Improve "MultiPackage" exampleBetsy McPhail2020-01-1017-50/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename to Step 12 and ensure that it follows Step 11
| * | | | | | | | | Tutorial: Add links to relevant CMake documentationBetsy McPhail2020-01-091-126/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add links for commands, properties and variables.
* | | | | | | | | | Merge topic 'cross-ninja-improve-error-handling'Brad King2020-01-143-9/+11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca9100c5ce Ninja Multi-Config: Improve error handling when not doing cross-config build Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4214
| * | | | | | | | | | Ninja Multi-Config: Improve error handling when not doing cross-config buildKyle Edwards2020-01-133-9/+11
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'release-3.16'Brad King2020-01-140-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'vs-Fortran-link-flags' into release-3.16Brad King2020-01-141-0/+8
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3c827b2ea VS: Add Fortran link flag table entries for /OPT:* Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4210
* | \ \ \ \ \ \ \ \ \ Merge topic 'vs-Fortran-link-flags'Brad King2020-01-141-0/+8
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3c827b2ea VS: Add Fortran link flag table entries for /OPT:* Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4210
| * | | | | | | | | | VS: Add Fortran link flag table entries for /OPT:*Pavel Liavonau2020-01-131-0/+8
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20190
* | | | | | | | | | Merge topic 'fix-global-autogen-target-help'Brad King2020-01-141-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3104dc059c Help: Fix variable name on CMAKE_GLOBAL_AUTOGEN_TARGET page Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4212
| * | | | | | | | | | Help: Fix variable name on CMAKE_GLOBAL_AUTOGEN_TARGET pageJoerg Bornemann2020-01-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMAKE_GLOBAL_AUTORCC_TARGET was mentioned accidentally.
* | | | | | | | | | | Merge topic 'xcode-default-warnings'Brad King2020-01-142-3/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7b8331d68 Xcode: Drop hard-coded default warning flags like -Wmost Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4213
| * | | | | | | | | | | Xcode: Drop hard-coded default warning flags like -WmostBrad King2020-01-132-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `-Wmost` flag was added by commit 97a51d2172 (ENH: add more xcode stuff, 2005-01-27, v2.4.0~2396), along with a couple others, as part of very early work on the Xcode generator. I suspect that the flags were part of Xcode's project creation wizard. However, they are not appropriate for CMake-based projects because we already have our own mechanisms for specifying flags desired by the project or user. Simply drop the flags. Fixes: #13516
* | | | | | | | | | | | 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
| |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |