summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FPHSA: detect package name mismatchesBen Boeckel2020-01-1410-3/+113
| | | | | | | The `FPHSA_NAME_MISMATCHED` variable may be set if this is intentional (but should be cleared after the call to not affect other FPHSA calls). It may also be passed via the `NAME_MISMATCHED` option for new-signature FPHSA calls.
* 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
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | 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
generated by cgit v0.12 at 2025-02-09 12:54:56 (GMT)