summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Ninja: Factor metadata cleanup into dedicated methodBrad King2020-01-272-0/+6
|
* Ninja: Skip cleandead and recompact if build.ninja is missingBrad King2020-01-271-2/+10
| | | | | In error cases the `build.ninja` file may not exist. Skip running ninja tools that require it so that we do not generate additional errors.
* Ninja: Fix CMAKE_NINJA_OUTPUT_PATH_PREFIX with Ninja 1.10Brad King2020-01-271-4/+7
| | | | | | | | | | | The ninja 1.10 tools we use since commit fb18215904 (Ninja: clean ninja metadata once generated, 2019-05-13) expect `build.ninja` to be available and loadable. In commit 6cc74b6140 (cmGlobalNinjaGenerator: avoid cleandead and recompact in Ninja-Multi, 2020-01-22) we added a condition to exclude the tools in a case where `build.ninja` is not available. Generalize that condition using a local variable and extend it for the case that `build.ninja` is not loadable in the current directory because it is meant to be a sub-ninja for a higher directory.
* Tests: Fix RunCMake.CMP0037 test with Ninja 1.10Brad King2020-01-271-2/+23
| | | | | | | | The CMP0037 OLD and WARN cases that actually use reserved target names like `all` produce `build.ninja` files with duplicate build statements producing the same output. With Ninja 1.10 and above we run ninja tools at the end of generation that require `build.ninja` to be loadable. It is not loadable for these test cases, so skip them.
* Tests: Fix RunCMake.Ninja test for Ninja 1.10Brad King2020-01-271-0/+1
| | | | | | | With Ninja 1.10 we run the cleandead and recompact tools after generation. These require that `build.ninja` be loadable. Update the `CustomCommandJobPool` case to define the referenced job pools to make `build.ninja` loadable.
* Merge topic 'fix-ninja-multi-framework-header'Brad King2020-01-274-8/+55
|\ | | | | | | | | | | | | 63c9cd2088 Ninja Multi-Config: Fix bug with MacOS frameworks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4279
| * Ninja Multi-Config: Fix bug with MacOS frameworksKyle Edwards2020-01-244-8/+55
| |
* | Merge topic 'depend-on-target-real-name'Brad King2020-01-273-1/+14
|\ \ | | | | | | | | | | | | | | | | | | 08699cec68 add_custom_command: Fix dependency on macOS framework target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4273
| * | add_custom_command: Fix dependency on macOS framework targetBrad King2020-01-243-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | When the `DEPENDS` option names a logical target name, convert to the "real" path of that target rather than any of the symlink-provided alternative file names. This makes the dependencies consistent with the outputs named by link rules producing the target artifacts. Fixes: #20264
* | | Merge topic 'csharp-no-valued-macros'Brad King2020-01-272-4/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | effd4d0569 CSharp: Do not pass definitions with values Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4267
| * | | CSharp: Do not pass definitions with valuesSumit Bhardwaj2020-01-242-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The Microsoft C# tooling does not accept definitions with values. Filter them out. Fixes: #19817
* | | | Merge topic 'check-language-make-program'Brad King2020-01-271-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9d0f61839b CheckLanguage: Pass CMAKE_MAKE_PROGRAM to child process Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4272
| * | | | CheckLanguage: Pass CMAKE_MAKE_PROGRAM to child processKyle Edwards2020-01-241-0/+6
| | | | | | | | | | | | | | | | | | | | Fixes: #20017
* | | | | Merge topic 'cpack-dmg-breaklongline'Brad King2020-01-271-2/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a3a7d5f5d CPack/DragNDrop: Fix word corruption in BreakLongLines Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4275
| * | | | | CPack/DragNDrop: Fix word corruption in BreakLongLinesKoray Kilinc2020-01-241-2/+3
| | |_|/ / | |/| | | | | | | | | | | | | When the lines are wrapped the leading characters of the next word were being lost
* | | | | Merge topic 'cpack-dmg-rtf-for-sla'Brad King2020-01-273-13/+44
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9571929701 CPack/DragNDrop: Support RTF licenses Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4270
| * | | | | CPack/DragNDrop: Support RTF licensesAndrew Fuller2020-01-243-13/+44
| |/ / / /
* | | | | Merge topic 'stl-support'Brad King2020-01-273-16/+146
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73d1da4f86 Stl support: cm::append now supports any sequential container Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4251
| * | | | | Stl support: cm::append now supports any sequential containerMarc Chevrier2020-01-243-16/+146
| | |/ / / | |/| | |
* | | | | Merge topic 'makefiles-suppress-vcs-implicit-rules'Brad King2020-01-271-3/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 879e56f336 makefiles: suppress RCS and SCCS implicit rules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4264
| * | | | | makefiles: suppress RCS and SCCS implicit rulesBen Boeckel2020-01-241-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are not suffix rules and are not suppressed by the empty `.SUFFIXES` recipe. Additionally, the old `SUFFIXES =` code didn't actually accomplish this, so remove it.
* | | | | | Merge topic 'FindGTest-upstream-lib-names'Brad King2020-01-272-0/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fbd3ea2047 FindGTest: Add GTest::{gtest,gtest_main} library names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4268
| * | | | | | FindGTest: Add GTest::{gtest,gtest_main} library namesPaweł Bylica2020-01-242-0/+15
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces 2 new INTERFACE IMPORTED libraries: GTest::gtest and GTest::gtest_main. They link to GTest::GTest and GTest::Main targets respectively, therefore working as aliases. These new names map the names of the targets from upstream GTest's CMake package config. Fixes: #20255
* | | | | | Merge branch 'release-3.16'Brad King2020-01-270-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge topic 'cpack-deb-fix-description' into release-3.16Brad King2020-01-276-9/+20
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | baec299ecd CPack: Fix regression in Deb description Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4271
* | \ \ \ \ \ \ Merge topic 'cpack-deb-fix-description'Brad King2020-01-276-9/+20
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | baec299ecd CPack: Fix regression in Deb description Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4271
| * | | | | | | CPack: Fix regression in Deb descriptionKyle Edwards2020-01-246-9/+20
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Fixes: #20254
* | | | | | | CMake Nightly Date StampKitware Robot2020-01-271-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2020-01-261-1/+1
| | | | | | |
* | | | | | | Merge topic 'Qt4Macros-last-ext'Craig Scott2020-01-251-5/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd83dab339 Qt4Macros: Only cut last extension (".ts") and replace it with ".qm" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4211
| * | | | | | | Qt4Macros: Only cut last extension (".ts") and replace it with ".qm"Kai Blaschke2020-01-231-5/+7
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-01-251-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge topic 'ninja-multi-cross-configs'Brad King2020-01-2421-14/+455
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7a2baf38c Ninja Multi-Config: Add variable to control configs used in cross-config build Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4269
| * | | | | | | Ninja Multi-Config: Add variable to control configs used in cross-config buildKyle Edwards2020-01-2321-14/+455
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge topic 'vs-dotnet-standard-core'Brad King2020-01-2418-23/+216
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae1e1909a1 VS: Add support for .NET Standard and .NET Core Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4240
| * | | | | | VS: Add support for .NET Standard and .NET CoreJoerg Bornemann2020-01-2418-23/+216
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Fixes: #20105
* | | | | | Merge topic 'findCUDAToolkit_support_cross_compilation'Brad King2020-01-241-5/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48bd2e0630 CUDAToolkit: Make sure to also search 'stubs' directory 69fcad9332 CUDAToolkit: Add support for cross-compiling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4253
| * | | | | | CUDAToolkit: Make sure to also search 'stubs' directoryRobert Maynard2020-01-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #20252
| * | | | | | CUDAToolkit: Add support for cross-compilingRobert Maynard2020-01-231-3/+43
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CUDAToolkit now searches the correct targets folder based on what platform we are cross-compiling for. Fixes: #20232
* | | | | | Merge topic 'trace_json_timestamp'Brad King2020-01-243-7/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c829f0cfca trace: Add time and stack level to JSON output format Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Volo Zyko <volo.zyko@gmail.com> Merge-request: !4242
| * | | | | | trace: Add time and stack level to JSON output formatFrank Winklmeier2020-01-223-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the timestamp and stack depth of the function call to the JSON trace output format. This information can be useful for cmake profiling and call stack inspection (see e.g. https://github.com/volo-zyko/cmake-profile-stats). Improve unit test to allow for varying set of keys to check in trace lines.
* | | | | | | Merge topic 'multi-ninja-no-cleandead'Brad King2020-01-241-2/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6cc74b6140 cmGlobalNinjaGenerator: avoid cleandead and recompact in Ninja-Multi Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4261
| * | | | | | | cmGlobalNinjaGenerator: avoid cleandead and recompact in Ninja-MultiBen Boeckel2020-01-231-2/+11
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Fixes: #20247
* | | | | | | Merge topic 'fphsa-no-regexp'Brad King2020-01-241-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31144f85af FPHSA: Check _FOUND var name with STREQUAL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4266
| * | | | | | | FPHSA: Check _FOUND var name with STREQUALFeRD (Frank Dana)2020-01-241-2/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using MATCHES "^${_Name}_FOUND$" limits the name of the found variable, since it can't contain any regular expression special-chars (period, plus sign, etc.)
* | | | | | | CMake Nightly Date StampKitware Robot2020-01-241-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'organize_makefile_help_output'Kyle Edwards2020-01-231-8/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7c1470f146 Makefiles: Organize help output to group 'like' targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4260
| * | | | | | Makefiles: Organize help output to group 'like' targetsRobert Maynard2020-01-221-8/+23
| | | | | | |
* | | | | | | Merge branch 'release-3.16'Brad King2020-01-230-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge topic 'get-runtime-dependencies-keyword-args' into release-3.16Brad King2020-01-233-5/+34
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c8a917a87 file(GET_RUNTIME_DEPENDENCIES): Tolerate empty list arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4262
generated by cgit v0.12 at 2025-01-31 13:00:55 (GMT)