summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'install-name-tool-bug'Brad King2020-01-282-5/+9
|\
| * Tests: Disable test on problematic versions of install_name_toolKyle Edwards2020-01-272-5/+9
* | CMake Nightly Date StampKitware Robot2020-01-281-1/+1
* | Merge topic 'fix-ninja-multi-framework-header'Brad King2020-01-274-8/+55
|\ \
| * | 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
|\ \ \
| * | | add_custom_command: Fix dependency on macOS framework targetBrad King2020-01-243-1/+14
* | | | Merge topic 'csharp-no-valued-macros'Brad King2020-01-272-4/+8
|\ \ \ \
| * | | | CSharp: Do not pass definitions with valuesSumit Bhardwaj2020-01-242-4/+8
* | | | | Merge topic 'check-language-make-program'Brad King2020-01-271-0/+6
|\ \ \ \ \
| * | | | | CheckLanguage: Pass CMAKE_MAKE_PROGRAM to child processKyle Edwards2020-01-241-0/+6
* | | | | | Merge topic 'cpack-dmg-breaklongline'Brad King2020-01-271-2/+3
|\ \ \ \ \ \
| * | | | | | CPack/DragNDrop: Fix word corruption in BreakLongLinesKoray Kilinc2020-01-241-2/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge topic 'cpack-dmg-rtf-for-sla'Brad King2020-01-273-13/+44
|\ \ \ \ \ \
| * | | | | | CPack/DragNDrop: Support RTF licensesAndrew Fuller2020-01-243-13/+44
| |/ / / / /
* | | | | | Merge topic 'stl-support'Brad King2020-01-273-16/+146
|\ \ \ \ \ \
| * | | | | | 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
|\ \ \ \ \ \
| * | | | | | makefiles: suppress RCS and SCCS implicit rulesBen Boeckel2020-01-241-3/+9
* | | | | | | Merge topic 'FindGTest-upstream-lib-names'Brad King2020-01-272-0/+15
|\ \ \ \ \ \ \
| * | | | | | | FindGTest: Add GTest::{gtest,gtest_main} library namesPaweł Bylica2020-01-242-0/+15
| | |_|/ / / / | |/| | | | |
* | | | | | | 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
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'cpack-deb-fix-description'Brad King2020-01-276-9/+20
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | CPack: Fix regression in Deb descriptionKyle Edwards2020-01-246-9/+20
| |/ / / / / / /
* | | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | 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
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | VS: Add support for .NET Standard and .NET CoreJoerg Bornemann2020-01-2418-23/+216
| | |_|_|_|/ | |/| | | |
* | | | | | Merge topic 'findCUDAToolkit_support_cross_compilation'Brad King2020-01-241-5/+45
|\ \ \ \ \ \
| * | | | | | CUDAToolkit: Make sure to also search 'stubs' directoryRobert Maynard2020-01-231-2/+2
| * | | | | | CUDAToolkit: Add support for cross-compilingRobert Maynard2020-01-231-3/+43
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'trace_json_timestamp'Brad King2020-01-243-7/+22
|\ \ \ \ \ \
| * | | | | | trace: Add time and stack level to JSON output formatFrank Winklmeier2020-01-223-7/+22
* | | | | | | Merge topic 'multi-ninja-no-cleandead'Brad King2020-01-241-2/+11
|\ \ \ \ \ \ \
| * | | | | | | cmGlobalNinjaGenerator: avoid cleandead and recompact in Ninja-MultiBen Boeckel2020-01-231-2/+11
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge topic 'fphsa-no-regexp'Brad King2020-01-241-2/+4
|\ \ \ \ \ \ \
| * | | | | | | FPHSA: Check _FOUND var name with STREQUALFeRD (Frank Dana)2020-01-241-2/+4
| |/ / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2020-01-241-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'organize_makefile_help_output'Kyle Edwards2020-01-231-8/+23
|\ \ \ \ \ \
| * | | | | | 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
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'get-runtime-dependencies-keyword-args'Brad King2020-01-233-5/+35
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'backport-get-runtime-dependencies-keyword-args'Brad King2020-01-220-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |