Commit Graph

39302 Commits

Author SHA1 Message Date
Craig Scott bf5b56b1a9 Merge topic 'doc-dev-mr-edit'
fc7e1de188 CONTRIBUTING: Mention GitLab option to allow edits from maintainers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1954
2018-04-12 17:48:36 -04:00
Brad King fc7e1de188 CONTRIBUTING: Mention GitLab option to allow edits from maintainers
Collaboration between contributors and developers is easier if a
developer can push an update to a contributor's MR source branch.
2018-04-12 13:16:38 -04:00
Brad King 4984d8433e Merge branch 'release-3.11' 2018-04-12 11:47:23 -04:00
Brad King 498be66fd7 Merge topic 'add_support_for_clr_targets'
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
2018-04-12 11:36:28 -04:00
Brad King 2cdefcbe62 Merge topic 'variable_watch-on-PARENT_SCOPE'
65198cfd0f variable_watch: trigger on variables set via PARENT_SCOPE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1948
2018-04-12 11:32:37 -04:00
Brad King d59cd3b131 Merge topic 'features-msvc-2017'
5f4272cc06 Features: Record for VS 2017 through 15.6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1903
2018-04-12 11:31:42 -04:00
Brad King aa5bedc52b Merge topic 'attr-escape'
ff18dce5ed cmVisualStudio10TargetGenerator: Properly escape attributes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1937
2018-04-12 11:29:24 -04:00
Brad King b148d3ade0 Merge topic 'FindMatlab-handle-exception'
ffb1f19191 FindMatlab: add unit tests
44c916b4c8 FindMatlab: always handle uncaught exception

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1946
2018-04-12 11:28:31 -04:00
Brad King f2376a5622 Merge topic 'FindwxWidgets-local-var'
9174786008 FindwxWidgets: Use more private name for local variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1951
2018-04-12 11:27:36 -04:00
Brad King 580822fa67 Merge topic 'FindImageMagick-FixForMultipleInstalls'
68d1fc89ed FindImageMagick: Find components in same locations as main package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1917
2018-04-12 11:26:43 -04:00
Kitware Robot 3551aede35 CMake Nightly Date Stamp 2018-04-12 00:01:03 -04:00
Matteo Settenvini 65198cfd0f variable_watch: trigger on variables set via PARENT_SCOPE
Make sure that we also trigger variable watches when a variable
is set in the parent scope.

Fixes: #17827
2018-04-11 15:02:07 -04:00
Roman Wüger 68d1fc89ed FindImageMagick: Find components in same locations as main package
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.
2018-04-11 11:32:09 -04:00
Brad King 61607fffbb Merge branch 'features-msvc-2017' into release-3.11
Merge-request: !1903
2018-04-11 11:30:02 -04:00
Daniel Filipe 5f4272cc06 Features: Record for VS 2017 through 15.6
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.
2018-04-11 11:27:07 -04:00
Andrea Ranieri 9174786008 FindwxWidgets: Use more private name for local variable
Avoid using a `_filename` variable that may be set by project code.
Also unset the variable name that we do use to avoid conflict.
2018-04-11 10:41:10 -04:00
Brad King aad0967e7d Merge branch 'release-3.11' 2018-04-11 10:34:11 -04:00
Brad King ded33659b1 Merge topic 'cpack-trace-nullptr'
6f2701abf6 CPack: Fix crash on invalid generator name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1950
2018-04-11 10:33:48 -04:00
Craig Scott 952d72b79d Merge topic 'UseSWIG-bugfixes'
963837cf17 UseSWIG: fix erroneous generator expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1947
2018-04-11 08:01:00 -04:00
Kitware Robot bb1d1f160f CMake Nightly Date Stamp 2018-04-11 00:01:04 -04:00
Brad King 3c0fed488f Merge branch 'cpack-trace-nullptr' into release-3.11
Merge-request: !1950
2018-04-10 15:01:43 -04:00
Brad King 6f2701abf6 CPack: Fix crash on invalid generator name
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
2018-04-10 15:00:37 -04:00
Brad King 7eecf8ca50 Merge branch 'release-3.11' 2018-04-10 11:36:46 -04:00
Brad King 5c10e8f608 Merge topic 'fix-crash-trace-exp-uninit-vars'
aad360eb3d Fix crash with --trace-expand --warn-uninitialized together

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1944
2018-04-10 11:32:56 -04:00
Brad King 9fabee00ca Merge topic 'doc-install-export-android'
4a127b78fd Help: Fix install(EXPORT_ANDROID_MK) mode documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1943
2018-04-10 11:31:42 -04:00
Marc Chevrier 963837cf17 UseSWIG: fix erroneous generator expressions
Add note regarding multi-config generators
2018-04-10 11:28:32 +02:00
Kitware Robot e769e61f99 CMake Nightly Date Stamp 2018-04-10 00:01:06 -04:00
Raffi Enficiaud ffb1f19191 FindMatlab: add unit tests 2018-04-09 23:36:53 +02:00
Clemens Buchacher 44c916b4c8 FindMatlab: always handle uncaught exception
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.
2018-04-09 21:42:18 +02:00
Brad King ef077c8ba4 Merge branch 'fix-crash-trace-exp-uninit-vars' into release-3.11
Merge-request: !1944
2018-04-09 12:01:10 -04:00
R2RT aad360eb3d Fix crash with --trace-expand --warn-uninitialized together
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
2018-04-09 11:59:07 -04:00
Brad King 4a127b78fd Help: Fix install(EXPORT_ANDROID_MK) mode documentation
`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
2018-04-09 11:32:10 -04:00
Brad King 23a450044d Merge topic 'test-CompileFeatures-simplify'
4edf0d68ee Tests: Simplify CompileFeatures expectation logic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1939
2018-04-09 11:20:19 -04:00
Brad King 847ae3882e Merge topic 'FindCUDA-nvcc-clcache-support'
2da3698447 FindCUDA: Add support for clcache

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1933
2018-04-09 11:19:44 -04:00
Michael Stürmer 312527de47 document COMMON_LANGUAGE_RUNTIME target properties 2018-04-09 06:50:39 +02:00
Kitware Robot 13f19f7472 CMake Nightly Date Stamp 2018-04-09 00:01:03 -04:00
Kitware Robot 843bd8e91b CMake Nightly Date Stamp 2018-04-08 00:01:04 -04:00
Kitware Robot 9576863d18 CMake Nightly Date Stamp 2018-04-07 00:01:07 -04:00
Craig Scott 2163549609 Merge topic 'UseSWIG-bugfixes'
38dcdd7641 UseSWIG: Ensure tests are usable in multi-config mode.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1934
2018-04-06 19:47:07 -04:00
Brad King 4edf0d68ee Tests: Simplify CompileFeatures expectation logic
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.
2018-04-06 14:45:58 -04:00
Edward Z. Yang 2da3698447 FindCUDA: Add support for clcache
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>
2018-04-06 11:21:34 -04:00
Brad King 576d01fed4 Merge topic 'ninja-fortran-rspfile'
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
2018-04-06 10:30:40 -04:00
Brad King 607b0ac2f3 Merge topic 'minor-cleanups'
acda926a04 Replace some uses of sprintf with std::to_string
418541035f cmCTestCurl: Fix UploadFile declared parameter names
1519628e60 cmVisualStudio10TargetGenerator: Make NsightTegraVersion unsigned
2f87d00803 cmMacroCommand: Fix format string to match type of argument
b0676cc5d4 Add in-class initialization of some members
966dba5b68 cmAlgorithms: Remove unnecessary typename keyword
12a145534a gitignore: Ignore a .vs directory in the source tree

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1932
2018-04-06 10:29:38 -04:00
Brad King 5454b41e1b Merge topic 'sanitize-LINK_DIRECTORIES'
0ad329f7c0 Sanitize paths from LINK_DIRECTORIES directory property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1920
2018-04-06 10:26:47 -04:00
Brad King 58e847c49a Merge topic 'xml-level'
050ddfb3f3 cmXMLWriter: code improvement

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1925
2018-04-06 10:25:46 -04:00
Brad King d308e9442e Merge topic 'glob_configure_depends'
6c4f8b4596 Adjust help documentation for file(GLOB), add topic notes
20612978c8 Add tests for `file(GLOB)` CONFIGURE_DEPENDS flag
3f4b81f540 Add glob verify support to XCode, VS, Ninja, and Makefile generators
ca0befc2e1 Add `CONFIGURE_DEPENDS` flag support to cmFileCommand::HandleGlobCommand
599c93e22d Add cmGlobVerificationManager class, integrate with cmake and cmState

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1767
2018-04-06 10:25:08 -04:00
Kitware Robot 2e49bb6434 CMake Nightly Date Stamp 2018-04-06 00:01:03 -04:00
Vitaly Stakhovsky ff18dce5ed cmVisualStudio10TargetGenerator: Properly escape attributes
In addition to common XML escape characters, attributes require escaping
the double quote character. A new function, cmVS10EscapeAttr is added and
used where appropriate.
2018-04-05 21:20:16 -04:00
jrp2014 acda926a04 Replace some uses of sprintf with std::to_string 2018-04-05 15:34:23 -04:00
jrp2014 418541035f cmCTestCurl: Fix UploadFile declared parameter names
Match the order used in the definition.
2018-04-05 13:42:49 -04:00