Brad King authored 8 years ago and Kitware Robot committed 8 years ago

65481a60 CUDA: Work around VS limitation in CudaOnly.WithDefs test
8cae24a1 VS: Add more CUDA flag table entries
6ca4f222 VS: Add support for the CUDA_SEPARABLE_COMPILATION property
94255511 VS: Select CUDA code generation architectures
253594d0 VS: Select the CUDA runtime library
4def02a3 VS: Place CUDA host compiler options in proper project file fields
29f07b08 VS: Do not pass CUDA compile options to C compiler
b966f489 VS: Do not use absolute paths to CUDA sources
...

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

Brad King authored 8 years ago and Kitware Robot committed 8 years ago

f36eaf6a Refactor WINDOWS_EXPORT_ALL_SYMBOLS implementation
25d261ef Refactor module definition file selection
1e0a9ac4 Refactor module definition source enumeration

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

Brad King authored 8 years ago and Kitware Robot committed 8 years ago

83be64d9 Merge branch 'upstream-KWSys' into update-kwsys
8ba8b553 KWSys 2017-03-07 (5da8cfe0)

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

Brad King authored 8 years ago and Kitware Robot committed 8 years ago

c4d481e5 FindGit: Avoid finding VS 2017 non-general Git installation

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

* upstream-KWSys:
  KWSys 2017-03-07 (5da8cfe0)

Kitware Robot authored 8 years ago and Brad King committed 8 years ago

Code extracted from:

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

at commit 5da8cfe0544f95697808b0b46ed3183621902f0b (master).

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

Ben Boeckel (1):
      c5529406 SystemTools: use std::string::empty

Robert Maynard (1):
      27e64d34 SystemInformation: Teach Is64Bits to check host architecture at runtime

At a VS 2017 command prompt the `PATH` contains a directory that happens
to have a `Git/cmd/git.exe` inside it.  However, this executable is not
meant for general use.  Revise our use of `Git/` path suffixes to be
more specific to its original purpose of searching in the typical
`c:/Program Files*/Git/` installation directories.  Avoid using the
suffixes on `PATH` entries.

Fixes: #16706

Brad King authored 8 years ago and Kitware Robot committed 8 years ago

8fc934de GNU-FindBinUtils: Avoid setting policy CMP0054

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

The `cmake_policy(SET)` call triggers `CMP0011` warnings when this
module is used in a project that does not set `CMP0011` to NEW.  We
could avoid these with a `cmake_policy` PUSH/POP pair, but it is simpler
to adjust our code to not trigger `CMP0054` in the first place.

CUDA 8.0 MSBuild rules do not pass `-x cu` to nvcc and so cannot support
a custom file extension.  Fix our test for this to use a `.cu` extension
instead.

Parse the `-gencode=`, `-arch`, and `-code` flags and generate a
`CodeGeneration` field in the project file.

Parse the `-cudart=` option and add a corresponding `CudaRuntime`
field to the generated project file.  Also add a matching `.lib`
to the list of libraries linked.

The CUDA Toolkit's VS integration provides abstractions for host
compiler options for `nvcc` to pass through `-Xcompiler` to the host
MSVC.  Populate our secondary flag table and use it to remove flags from
the `AdditionalCompilerOptions` in favor of their abstractions.

Unfortunately a bug in the CUDA 8.0 VS integration prevents us from
passing anything in `AdditionalCompilerOptions` reliably.  After taking
out the flags that have dedicated abstractions, drop the rest.

The CUDA Toolkit's VS integration does not properly compute the
intermediate files directory location when the path to the source
file is absolute.

Generate the `CudaCompile` elements in `.vcxproj` files.

The CUDA Toolkit's VS integration defines abstractions for both options
to `nvcc` and options to pass through `-Xcompiler` to the host MSVC.
We need a separate flag table to parse each set of flags into the
corresponding abstractions.  Add empty placeholders for these tables.

Teach `CMakeDetermineCompilerId` how to generate a vcxproj file using
the `CMAKE_VS_PLATFORM_TOOLSET_CUDA`.

Remove a flag from the map and return its value.

This will allow a client to parse flags, replace the flag tables, and
then re-parse a field in which flags for a secondary tool were
collected.

Make the `ClCompile` element name and `PostBuildEvent/Command` value
configurable.  Move the current content into default values for the
corresponding variables.

If `CMAKE_GENERATOR_TOOLSET` does not have a `cuda=...` field then
find available CUDA toolsets and choose the highest version.

The NVIDIA CUDA Toolkit provides MSBuild toolset files for integration
with Visual Studio.  Multiple versions may be installed so we need a way
to tell our VS generators which CUDA toolset to use.  Extend the
`CMAKE_GENERATOR_TOOLSET` specification to provide a `cuda=...` field
specifying the version number.

Run MSBuild on a simple `.vcxproj` file to extract the location of the
toolset definitions.  This will later be useful for looking at available
BuildCustomizations.

Brad King authored 8 years ago and Kitware Robot committed 8 years ago

b9d36826 Add 'CMAKE_GCC_AR' and 'CMAKE_GCC_RANLIB' variables

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

Brad King authored 8 years ago and Kitware Robot committed 8 years ago

ae0f7dfa Tests: Fix CPackComponents NSIS install root

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

Use `cmGeneratorTarget::ModuleDefinitionInfo` to combine the
implementation of `WINDOWS_EXPORT_ALL_SYMBOLS` with that of using a
`.def` file as a source.  Only one of these could be used within a
single target before anyway.

Create a `ModuleDefinitionInfo` structure for each configuration of a
target to hold corresponding information about the selected module
definition file (`.def` source).

Add a `cmGeneratorTarget::GetModuleDefinitionSources` method.

d9bdcf34 Tests: Add x32 tests to test suite
5b6d354f Help: Add notes for topic 'x32-abi'
bed9c73d Modules: Add x32-abi support to hard-coded paths
462cf254 Add support for x32-abi

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

Brad King authored 8 years ago and Kitware Robot committed 8 years ago

d9bdcf34 Tests: Add x32 tests to test suite
5b6d354f Help: Add notes for topic 'x32-abi'
bed9c73d Modules: Add x32-abi support to hard-coded paths
462cf254 Add support for x32-abi

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