summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* cmVisualStudio10TargetGenerator: Use cmLocalVisualStudio10GeneratorFujii Hironori2018-04-172-4/+5
* Merge topic 'cuda-compiler-loaded'Brad King2018-04-161-0/+1
|\
| * CUDA: Set CMAKE_CUDA_COMPILER_LOADED variable when language is enabledHenry Schreiner2018-04-131-0/+1
* | Merge topic 'vs-cuda-pdb'Brad King2018-04-165-0/+51
|\ \
| * | VS: Add workaround for CUDA compiler PDB locationBrad King2018-04-135-0/+51
* | | Merge topic 'test-ExternalData-dedup'Brad King2018-04-162-3/+4
|\ \ \
| * | | Tests: Avoid duplicate rules in ExternalData testBrad King2018-04-132-3/+4
* | | | Merge branch 'release-3.11'Brad King2018-04-160-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'backport-fix-explicit-CMakeLists.txt' into release-3.11Brad King2018-04-1310-9/+91
| |\ \ \ \
* | \ \ \ \ Merge topic 'fix-explicit-CMakeLists.txt'Brad King2018-04-1610-9/+91
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'backport-fix-explicit-CMakeLists.txt'Brad King2018-04-1310-9/+91
| |\ \ \ \ \ \ | | | |/ / / / | | |/| / / / | | |_|/ / / | |/| | | |
| | * | | | Restore support for explicitly referenced CMakeLists.txt sourcesBrad King2018-04-1310-9/+91
* | | | | | CMake Nightly Date StampKitware Robot2018-04-161-1/+1
* | | | | | CMake Nightly Date StampKitware Robot2018-04-151-1/+1
* | | | | | CMake Nightly Date StampKitware Robot2018-04-141-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'clang-cl-std'Brad King2018-04-131-5/+42
|\ \ \ \ \
| * | | | | Clang: Add standard flags support when simulating MSVCRuben Van Boxem2018-04-111-0/+21
| * | | | | Clang: Avoid extra C++ feature detection when simulating MSVCBrad King2018-04-111-0/+15
| * | | | | Clang: Refactor standard flags logic when simulating MSVCBrad King2018-04-111-5/+6
* | | | | | Merge topic 'update-kwsys'Brad King2018-04-131-2/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-04-121-2/+0
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | KWSys 2018-04-12 (9da3e5bc)KWSys Upstream2018-04-121-2/+0
* | | | | | CMake Nightly Date StampKitware Robot2018-04-131-1/+1
* | | | | | Merge topic 'doc-dev-mr-edit'Craig Scott2018-04-121-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | CONTRIBUTING: Mention GitLab option to allow edits from maintainersBrad King2018-04-121-0/+1
|/ / / / /
* | | | | Merge branch 'release-3.11'Brad King2018-04-120-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'features-msvc-2017' into release-3.11Brad King2018-04-111-21/+15
| |\ \ \ \
* | \ \ \ \ Merge topic 'add_support_for_clr_targets'Brad King2018-04-1215-24/+188
|\ \ \ \ \ \
| * | | | | | document COMMON_LANGUAGE_RUNTIME target propertiesMichael Stürmer2018-04-094-0/+37
| * | | | | | cmVisualStudio10TargetGenerator: set /clr compiler flag from propertyMichael Stürmer2018-04-051-0/+16
| * | | | | | cmExportFileGenerator: add target property for managed targetsMichael Stürmer2018-04-051-0/+14
| * | | | | | cmGeneratorTarget: add handling of managed assemblies to HasImportLibrary()Michael Stürmer2018-04-051-1/+4
| * | | | | | cmGeneratorTarget: Make import library checks config-awareMichael Stürmer2018-04-059-23/+26
| * | | | | | cmGeneratorTarget: add GetManagedType() and CheckManagedType() methodsMichael Stürmer2018-04-052-0/+73
| * | | | | | cmGeneratorTarget: add HasLanguage() as wrapper for GetLanguages()Michael Stürmer2018-04-052-0/+18
* | | | | | | Merge topic 'variable_watch-on-PARENT_SCOPE'Brad King2018-04-124-0/+27
|\ \ \ \ \ \ \
| * | | | | | | variable_watch: trigger on variables set via PARENT_SCOPEMatteo Settenvini2018-04-114-0/+27
* | | | | | | | Merge topic 'features-msvc-2017'Brad King2018-04-121-21/+15
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Features: Record for VS 2017 through 15.6Daniel Filipe2018-04-111-21/+15
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge topic 'attr-escape'Brad King2018-04-121-47/+48
|\ \ \ \ \ \ \
| * | | | | | | cmVisualStudio10TargetGenerator: Properly escape attributesVitaly Stakhovsky2018-04-061-47/+48
* | | | | | | | Merge topic 'FindMatlab-handle-exception'Brad King2018-04-124-5/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | FindMatlab: add unit testsRaffi Enficiaud2018-04-093-3/+44
| * | | | | | | | FindMatlab: always handle uncaught exceptionClemens Buchacher2018-04-091-2/+3
* | | | | | | | | Merge topic 'FindwxWidgets-local-var'Brad King2018-04-121-4/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | FindwxWidgets: Use more private name for local variableAndrea Ranieri2018-04-111-4/+6
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge topic 'FindImageMagick-FixForMultipleInstalls'Brad King2018-04-121-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | FindImageMagick: Find components in same locations as main packageRoman Wüger2018-04-111-0/+3
* | | | | | | | | | CMake Nightly Date StampKitware Robot2018-04-121-1/+1
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'release-3.11'Brad King2018-04-110-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |