Brad King authored Apr 16, 2018 and Kitware Robot committed Apr 16, 2018

595aa128

 CUDA: Set CMAKE_CUDA_COMPILER_LOADED variable when language is enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1955

Brad King authored Apr 16, 2018 and Kitware Robot committed Apr 16, 2018

134e795f

 VS: Add workaround for CUDA compiler PDB location

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1960

Brad King authored Apr 16, 2018 and Kitware Robot committed Apr 16, 2018

bb66cea6

 Tests: Avoid duplicate rules in ExternalData test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1958

Brad King authored Apr 16, 2018 and Kitware Robot committed Apr 16, 2018

0a122393 Merge branch 'backport-fix-explicit-CMakeLists.txt'
8480c2af

 Restore support for explicitly referenced CMakeLists.txt sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1959

Henry Schreiner authored Apr 12, 2018 and Brad King committed Apr 13, 2018

We already do this for C, CXX, Fortran, etc.

The CUDA Toolkit Visual Studio Integration does not honor the
`ClCompile.ProgramDataBaseFileName` field when telling `nvcc` how to
invoke `cl`.  Work around this problem by passing `-Xcompiler=-Fd...`
ourselves through `AdditionalOptions`.

Fixes: #17647

Brad King authored Apr 13, 2018 and Kitware Robot committed Apr 13, 2018

3f82c590 Clang: Add standard flags support when simulating MSVC
8381bc12 Clang: Avoid extra C++ feature detection when simulating MSVC
6cddf7ba

 Clang: Refactor standard flags logic when simulating MSVC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1906

Brad King authored Apr 13, 2018 and Kitware Robot committed Apr 13, 2018

5ebbf280 Merge branch 'upstream-KWSys' into update-kwsys
e488f738

 KWSys 2018-04-12 (9da3e5bc)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1953

Merge-request: !1959

Since commit v3.11.0-rc1~467^2 (VS,Xcode: Add CMakeLists.txt sources
without mutating targets, 2017-10-18) we do not add `CMakeLists.txt` to
target sources but instead generate references to them directly.  This
broke projects that explicitly specify their `CMakeLists.txt` file as a
source file because the explicit entry is no longer consolidated with
the generated one.

Teach the relevant generators to avoid duplicating `CMakeLists.txt`
source references and add test cases.

Fixes: #17828

In commit v3.7.0-rc1~158^2 (ExternalData: Tolerate files duplicated
across multiple targets, 2016-07-07) we added a test case for repeating
the same data file reference in three different targets in the same
directory in order to exercise its corresponding fix.  However, we
re-used the top-level `Data.dat` file which is already produced by
an unrelated test case.  `ninja` diagnoses the duplicate rule.

Update the test to use a dedicated data file name for the three-times
repeated case to avoid this conflict.  It still covers the original
purpose of the test.

Craig Scott authored Apr 12, 2018 and Kitware Robot committed Apr 12, 2018

fc7e1de1

 CONTRIBUTING: Mention GitLab option to allow edits from maintainers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1954

Collaboration between contributors and developers is easier if a
developer can push an update to a contributor's MR source branch.

* upstream-KWSys:
  KWSys 2018-04-12 (9da3e5bc)

Kitware Robot authored Apr 12, 2018 and Brad King committed Apr 12, 2018

Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 9da3e5bc847fa4187f42f60700e343a9ed09a161 (master).

Upstream Shortlog
-----------------

Brad King (1):
      c7ef6c1b SystemInformation: Do not include unnecessary fenv.h

Brad King authored Apr 12, 2018 and Kitware Robot committed Apr 12, 2018

312527de document COMMON_LANGUAGE_RUNTIME target properties
4b7a82b4 cmVisualStudio10TargetGenerator: set /clr compiler flag from property
20e31fb4 cmExportFileGenerator: add target property for managed targets
411a2270 cmGeneratorTarget: add handling of managed assemblies to HasImportLibrary()
fb433ff2 cmGeneratorTarget: Make import library checks config-aware
4c1f3396 cmGeneratorTarget: add GetManagedType() and CheckManagedType() methods
6c517a9f

 cmGeneratorTarget: add HasLanguage() as wrapper for GetLanguages()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1916

Brad King authored Apr 12, 2018 and Kitware Robot committed Apr 12, 2018

65198cfd

 variable_watch: trigger on variables set via PARENT_SCOPE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1948

Brad King authored Apr 12, 2018 and Kitware Robot committed Apr 12, 2018

5f4272cc

 Features: Record for VS 2017 through 15.6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1903

Brad King authored Apr 12, 2018 and Kitware Robot committed Apr 12, 2018

ff18dce5

 cmVisualStudio10TargetGenerator: Properly escape attributes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1937

Brad King authored Apr 12, 2018 and Kitware Robot committed Apr 12, 2018

ffb1f191 FindMatlab: add unit tests
44c916b4

 FindMatlab: always handle uncaught exception

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1946

Brad King authored Apr 12, 2018 and Kitware Robot committed Apr 12, 2018

91747860

 FindwxWidgets: Use more private name for local variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1951

Brad King authored Apr 12, 2018 and Kitware Robot committed Apr 12, 2018

68d1fc89

 FindImageMagick: Find components in same locations as main package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1917

Matteo Settenvini authored Apr 10, 2018 and Brad King committed Apr 11, 2018

Make sure that we also trigger variable watches when a variable
is set in the parent scope.

Fixes: #17827

Ruben Van Boxem authored Apr 07, 2018 and Brad King committed Apr 11, 2018

When Clang 3.9 simulates MSVC 19.0 or higher it knows the `-std:` flags
that such versions of MSVC defines.

Fixes: #17866

Apply the optimization from commit v3.10.0-rc1~131^2 (MSVC: Avoid
unnecessary C++ feature detection steps, 2017-09-11) to the case of
Clang simulating a version of MSVC that does not define standards.

Issue: #17274

Consolidate the compile options and standard defaults branches.
Add comments.

Roman authored Apr 03, 2018 and Brad King committed Apr 11, 2018

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.

Merge-request: !1903

Daniel Filipe authored Mar 30, 2018 and Brad King committed Apr 11, 2018

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.

Andrea Ranieri authored Apr 10, 2018 and Brad King committed Apr 11, 2018

Avoid using a `_filename` variable that may be set by project code.
Also unset the variable name that we do use to avoid conflict.