summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CONTRIBUTING: Mention GitLab option to allow edits from maintainersBrad King2018-04-121-0/+1
| | | | | Collaboration between contributors and developers is easier if a developer can push an update to a contributor's MR source branch.
* 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-request: !1903
* | \ Merge topic 'add_support_for_clr_targets'Brad King2018-04-1215-24/+188
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 312527de47 document COMMON_LANGUAGE_RUNTIME target properties 4b7a82b4ed cmVisualStudio10TargetGenerator: set /clr compiler flag from property 20e31fb4c9 cmExportFileGenerator: add target property for managed targets 411a22706a cmGeneratorTarget: add handling of managed assemblies to HasImportLibrary() fb433ff283 cmGeneratorTarget: Make import library checks config-aware 4c1f33961f cmGeneratorTarget: add GetManagedType() and CheckManagedType() methods 6c517a9f8d cmGeneratorTarget: add HasLanguage() as wrapper for GetLanguages() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1916
| * | | 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
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 65198cfd0f variable_watch: trigger on variables set via PARENT_SCOPE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1948
| * | | | variable_watch: trigger on variables set via PARENT_SCOPEMatteo Settenvini2018-04-114-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that we also trigger variable watches when a variable is set in the parent scope. Fixes: #17827
* | | | | Merge topic 'features-msvc-2017'Brad King2018-04-121-21/+15
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 5f4272cc06 Features: Record for VS 2017 through 15.6 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1903
| * | | | Features: Record for VS 2017 through 15.6Daniel Filipe2018-04-111-21/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 15.3 has more features than we recorded in commit v3.7.0-rc1~156^2~2 (Features: Record features for VS 15 Preview 4, 2016-09-05). While at it, update comments and simplify some cases.
* | | | | Merge topic 'attr-escape'Brad King2018-04-121-47/+48
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff18dce5ed cmVisualStudio10TargetGenerator: Properly escape attributes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1937
| * | | | | cmVisualStudio10TargetGenerator: Properly escape attributesVitaly Stakhovsky2018-04-061-47/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition to common XML escape characters, attributes require escaping the double quote character. A new function, cmVS10EscapeAttr is added and used where appropriate.
* | | | | | Merge topic 'FindMatlab-handle-exception'Brad King2018-04-124-5/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ffb1f19191 FindMatlab: add unit tests 44c916b4c8 FindMatlab: always handle uncaught exception Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1946
| * | | | | | FindMatlab: add unit testsRaffi Enficiaud2018-04-093-3/+44
| | | | | | |
| * | | | | | FindMatlab: always handle uncaught exceptionClemens Buchacher2018-04-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If runtests('$unittest_file') throws an exception it is ignored. It is easy to produce such an exception by passing a nonexistent file as UNITTEST_FILE. We already handle exceptions if the option NO_UNITTEST_FRAMEWORK is set. Use the same method to handle exceptions thrown by runtests or by a custom_Matlab_test_command. Fixes #16660.
* | | | | | | Merge topic 'FindwxWidgets-local-var'Brad King2018-04-121-4/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9174786008 FindwxWidgets: Use more private name for local variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1951
| * | | | | | | FindwxWidgets: Use more private name for local variableAndrea Ranieri2018-04-111-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid using a `_filename` variable that may be set by project code. Also unset the variable name that we do use to avoid conflict.
* | | | | | | | Merge topic 'FindImageMagick-FixForMultipleInstalls'Brad King2018-04-121-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 68d1fc89ed FindImageMagick: Find components in same locations as main package Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1917
| * | | | | | | | FindImageMagick: Find components in same locations as main packageRoman Wüger2018-04-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix component include/library path if multiple versions are installed. When searching for individual components, look only in the locations we expect to find them that we already computed.
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-04-121-1/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'release-3.11'Brad King2018-04-110-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'cpack-trace-nullptr' into release-3.11Brad King2018-04-105-4/+17
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1950
* | \ \ \ \ \ \ \ Merge topic 'cpack-trace-nullptr'Brad King2018-04-115-4/+17
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f2701abf6 CPack: Fix crash on invalid generator name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1950
| * | | | | | | | CPack: Fix crash on invalid generator nameBrad King2018-04-105-4/+17
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.11.0-rc1~68^2 (CPack: accept --trace and --trace-expand, 2017-12-09) a nullptr dereference was added that occurs when `cpack -G NotAGenerator` is invoked. Add the needed condition. Fixes: #17900
* | | | | | | | Merge topic 'UseSWIG-bugfixes'Craig Scott2018-04-111-7/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 963837cf17 UseSWIG: fix erroneous generator expressions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1947
| * | | | | | | | UseSWIG: fix erroneous generator expressionsMarc Chevrier2018-04-101-7/+11
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Add note regarding multi-config generators
* | | | | | | | CMake Nightly Date StampKitware Robot2018-04-111-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release-3.11'Brad King2018-04-100-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge branch 'fix-crash-trace-exp-uninit-vars' into release-3.11Brad King2018-04-095-8/+20
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1944
* | \ \ \ \ \ \ \ Merge topic 'fix-crash-trace-exp-uninit-vars'Brad King2018-04-105-8/+20
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aad360eb3d Fix crash with --trace-expand --warn-uninitialized together Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1944
| * | | | | | | | Fix crash with --trace-expand --warn-uninitialized togetherR2RT2018-04-095-8/+20
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some code paths in `ExpandVariablesInString{New,Old}` were not checking the `filename` parameter for a null pointer, but this can happen when using the above flags together. Add the checks and a test case. Fixes: #17896
* | | | | | | | Merge topic 'doc-install-export-android'Brad King2018-04-101-4/+5
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a127b78fd Help: Fix install(EXPORT_ANDROID_MK) mode documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1943
| * | | | | | | Help: Fix install(EXPORT_ANDROID_MK) mode documentationBrad King2018-04-091-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `install(EXPORT_ANDROID_MK)` is its own mode, not an option to the normal `install(EXPORT)` mode. While at it, also fix the prose in our documented example to match the code. Fixes: #17891
* | | | | | | | CMake Nightly Date StampKitware Robot2018-04-101-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge topic 'test-CompileFeatures-simplify'Brad King2018-04-091-174/+44
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4edf0d68ee Tests: Simplify CompileFeatures expectation logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1939
| * | | | | | | Tests: Simplify CompileFeatures expectation logicBrad King2018-04-061-174/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than repeating compiler version checks for feature availability, generate genex expectations using the detect list of features. We already separately verify that the list of features is correct.
* | | | | | | | Merge topic 'FindCUDA-nvcc-clcache-support'Brad King2018-04-091-0/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2da3698447 FindCUDA: Add support for clcache Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1933
| * | | | | | | FindCUDA: Add support for clcacheEdward Z. Yang2018-04-061-0/+5
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `CMAKE_C_COMPILER` is `clcache`, pass plain `cl` as the host compiler to `nvcc`. Otherwise, `nvcc` does not accept it. Signed-off-by: Edward Z. Yang <ezyang@fb.com>
* | | | | | | CMake Nightly Date StampKitware Robot2018-04-091-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-04-081-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-04-071-1/+1
| | | | | | |
* | | | | | | Merge topic 'UseSWIG-bugfixes'Craig Scott2018-04-069-41/+45
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38dcdd7641 UseSWIG: Ensure tests are usable in multi-config mode. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1934
| * | | | | | UseSWIG: Ensure tests are usable in multi-config mode.Marc Chevrier2018-04-059-41/+45
| |/ / / / / | | | | | | | | | | | | | | | | | | Fixes: #17875
* | | | | | Merge topic 'ninja-fortran-rspfile'Brad King2018-04-066-69/+104
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d6390ce26e Ninja: Fix Fortran support with response files 8592c6326b cmNinjaTargetGenerator: Move force-rspfile check to earlier e0aa060352 cmNinjaTargetGenerator: Move depfile logic to later in its function Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1936
| * | | | | | Ninja: Fix Fortran support with response filesBrad King2018-04-056-18/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Ninja generator splits preprocessing and compilation steps for Fortran. Fix this logic to work when using response files for compilation so that it works for the preprocessing step too. This fixes behavior under `CMAKE_NINJA_FORCE_RESPONSE_FILE`. Issue: #17877
generated by cgit v0.12 at 2025-01-08 16:43:47 (GMT)