summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ninja-nvcc-rsp'Brad King2019-06-261-13/+2
|\ | | | | | | | | | | | | eda4c43879 Ninja: Fix CUDA device linking when using response files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3482
| * Ninja: Fix CUDA device linking when using response filesFrancisco Facioni2019-06-251-13/+2
| | | | | | | | | | | | Fix the logic added by commit d91b5a72cd (Ninja: Add support for CUDA nvcc response files, 2019-05-30, v3.15.0-rc1~8^2) to always use the CUDA compiler response file flag for response files during device linking.
* | Merge topic 'iconv-c++11'Brad King2019-06-261-0/+2
|\ \ | | | | | | | | | | | | | | | | | | 736f38ff34 FindIconv test: request C++11 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3469
| * | FindIconv test: request C++11Rolf Eike Beer2019-06-251-0/+2
| | |
* | | Merge topic 'doc-CMAKE_FRAMEWORK-crossref'Brad King2019-06-261-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f57a53d43e Help: Document that CMAKE_FRAMEWORK initializes FRAMEWORK target prop Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3478
| * | | Help: Document that CMAKE_FRAMEWORK initializes FRAMEWORK target propCraig Scott2019-06-251-1/+3
| | |/ | |/|
* | | CMake Nightly Date StampKitware Robot2019-06-261-1/+1
| | |
* | | Merge topic 'fix-cmp0095-notes'Kyle Edwards2019-06-251-1/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dc764bd80d Help: Move CMP0095 into CMake 3.16 section Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3479
| * | | Help: Move CMP0095 into CMake 3.16 sectionKyle Edwards2019-06-251-1/+8
|/ / / | | | | | | | | | | | | | | | CMP0095 was introduced in 3.16, but was mistakenly put in the notes for 3.15. This error was not caught during review. Move it into the notes for 3.16.
* | | Merge topic 'matlab-if'Brad King2019-06-252-30/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 56e89e50d3 FindMatlab: simplify several if()-constructs 51bcdeb17f Tests: simplify checks for Matlab variables being set Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3472
| * | | FindMatlab: simplify several if()-constructsRolf Eike Beer2019-06-241-25/+25
| | | |
| * | | Tests: simplify checks for Matlab variables being setRolf Eike Beer2019-06-241-5/+5
| | | |
* | | | Merge topic 'refactor/use-unique_ptr'Brad King2019-06-2510-61/+42
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5e52de7d57 modermize: replace some raw pointers w/ `unique_ptr` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3465
| * | | | modermize: replace some raw pointers w/ `unique_ptr`Alex Turbov2019-06-2410-61/+42
| | | | |
* | | | | Merge topic 'find_matlab_exact'Brad King2019-06-251-8/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2454fe84f5 FindMatlab: Support EXACT versions Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raffi Enficiaud <raffi.enficiaud@free.fr> Merge-request: !3460
| * | | | | FindMatlab: Support EXACT versionsStefan Lietzau2019-06-241-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an exact version is requested, don't pick the latest matlab version but the one matching the requested version. Fixes: #19155
* | | | | | Merge topic 'FindPython-FIND_ABI'Brad King2019-06-257-100/+424
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9201908ca5 FindPython: add Python_FIND_ABI hint. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3463
| * | | | | | FindPython: add Python_FIND_ABI hint.Marc Chevrier2019-06-247-100/+424
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable will enable to specify will ABIs will be searched.
* | | | | | | Merge topic 'help-guide-tutorial'Brad King2019-06-25129-1018/+893
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ab8563533 Help: Add tutorial guide table of contents 0a6c9c417a Help: Update tutorial to include text from CMake book eef3e020c2 Help: Populate tutorial guide text 862cfc0e6c Help/guide/tutorial: Adopt tutorial code d2fde94809 Help: Add infrastructure for guide-level documentation f067af8e38 Tests/Tutorial: Remove trailing blank lines d5a81ef747 Tests/Tutorial: Remove unused file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3439
| * | | | | | | Help: Add tutorial guide table of contentsBrad King2019-06-191-0/+4
| | | | | | | |
| * | | | | | | Help: Update tutorial to include text from CMake bookBetsy McPhail2019-06-191-0/+35
| | | | | | | |
| * | | | | | | Help: Populate tutorial guide textBetsy McPhail2019-06-1944-939/+777
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate tutorial text from individual `directions.txt` files to the main tutorial document. Add some comments to source code to provide anchors for inclusion.
| * | | | | | | Help/guide/tutorial: Adopt tutorial codeKitware Robot2019-06-18123-2/+2
| | | | | | | |
| * | | | | | | Help: Add infrastructure for guide-level documentationBrad King2019-06-183-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a `Help/guide/` directory to hold guide-level documents. Build them in most documentation formats, but not as man pages. Initialize the guide directory with a placeholder for the tutorial.
| * | | | | | | Tests/Tutorial: Remove trailing blank linesBrad King2019-06-187-7/+0
| | | | | | | |
| * | | | | | | Tests/Tutorial: Remove unused fileBrad King2019-06-181-5/+0
| | |/ / / / / | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2019-06-251-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'release-3.15'Brad King2019-06-240-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'doc-typos-cmake_parse_arguments' into release-3.15Brad King2019-06-241-8/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3468
* | \ \ \ \ \ Merge topic 'doc-typos-cmake_parse_arguments'Brad King2019-06-241-8/+8
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 264612c013 Help: Typo and grammar fixes in cmake_parse_arguments() docs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !3468
| * | | | | | Help: Typo and grammar fixes in cmake_parse_arguments() docsCraig Scott2019-06-231-8/+8
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'release-3.15'Brad King2019-06-240-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'doc-IMPORTED_LOCATION' into release-3.15Brad King2019-06-211-4/+11
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3466
* | \ \ \ \ \ Merge topic 'doc-IMPORTED_LOCATION'Brad King2019-06-241-4/+11
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 96c6bc2584 Help: Improve documentation of IMPORTED_LOCATION property Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alex Turbov <i.zaufi@gmail.com> Merge-request: !3466
| * | | | | | Help: Improve documentation of IMPORTED_LOCATION propertyAlexandru Croitor2019-06-211-4/+11
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention the usage of a configuration specific `IMPORTED_LOCATION_<CONFIG>` value even if the `<CONFIG>` is not the same as the active configuration of the currently built project. Co-Author: Brad King <brad.king@kitware.com>
* | | | | | Merge topic 'vs-ce-deploy'Brad King2019-06-242-0/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7035bdeb52 VS10Generator: add project properties to enable WindowsCE deployment. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3462
| * | | | | | VS10Generator: add project properties to enable WindowsCE deployment.Wil Stark2019-06-192-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19408
* | | | | | | CMake Nightly Date StampKitware Robot2019-06-241-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2019-06-231-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2019-06-221-1/+1
| | | | | | |
* | | | | | | Merge topic 'find-control-vars'Brad King2019-06-2149-39/+426
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 02f527c66a Find: Provide global controls for the `NO_[]_PATH` call options f0a89149bc RunCMake: Automatically support platform out override files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3444
| * | | | | | Find: Provide global controls for the `NO_[]_PATH` call optionsRobert Maynard2019-06-2138-21/+374
| | | | | | |
| * | | | | | RunCMake: Automatically support platform out override filesRobert Maynard2019-06-2114-18/+52
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2019-06-211-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge topic 'BundleUtilities-cleanup'Brad King2019-06-202-42/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d59ebb704 GetPrerequisites: use CMAKE_OBJDUMP if it is set e33f4cb0cb BundleUtilities: use if(... IN_LIST ...) 6695383dd5 BundleUtilities: remove needless variable expansions in if() arguments d5333c0923 BundleUtilities: simplify inclusion of GetPrerequisites Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3447
| * | | | | | GetPrerequisites: use CMAKE_OBJDUMP if it is setRolf Eike Beer2019-06-191-1/+3
| | | | | | |
| * | | | | | BundleUtilities: use if(... IN_LIST ...)Rolf Eike Beer2019-06-191-28/+8
| | | | | | |
| * | | | | | BundleUtilities: remove needless variable expansions in if() argumentsRolf Eike Beer2019-06-171-17/+17
| | | | | | |
| * | | | | | BundleUtilities: simplify inclusion of GetPrerequisitesRolf Eike Beer2019-06-171-2/+1
| | | | | | |
* | | | | | | Merge topic 'update-libuv'Brad King2019-06-2048-356/+1856
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db4667cc72 libuv: fix compilation with macOS 10.10 SDK cee57246ef libuv: Add uv__statx() stub to cmake-bootstrap.c 69b139cfca Merge branch 'upstream-libuv' into update-libuv b4069b04ff libuv 2019-06-10 (ee24ce90) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3457