Commit Graph

35181 Commits

Author SHA1 Message Date
Kitware Robot a5931b61e9 CMake Nightly Date Stamp 2017-03-20 00:01:03 -04:00
Kitware Robot baba0a435a CMake Nightly Date Stamp 2017-03-19 00:01:04 -04:00
Kitware Robot 14f0378e10 CMake Nightly Date Stamp 2017-03-18 00:01:02 -04:00
Kitware Robot 45851e8500 CMake Nightly Date Stamp 2017-03-17 00:01:02 -04:00
Kitware Robot e781223c88 CMake Nightly Date Stamp 2017-03-16 00:01:02 -04:00
Kitware Robot b557f3e106 CMake Nightly Date Stamp 2017-03-15 00:01:03 -04:00
Kitware Robot 4d3f120c5f CMake Nightly Date Stamp 2017-03-14 00:01:03 -04:00
Brad King ccec62c6aa Merge branch 'release' 2017-03-13 11:03:42 -04:00
Brad King c0c8450386 Merge topic 'doc-vs-toolset-options'
3df2506f Help: Document VS generator toolset specification syntax
60546b48 Help: Cross-reference generator toolset variables
35c5cddc Help: Cross-reference generator platform variables
7df38939 Help: Move generator toolset support details to variable docs
c750b282 Help: Move generator platform support details to variable docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !580
2017-03-13 11:01:21 -04:00
Brad King 3df2506fb5 Help: Document VS generator toolset specification syntax 2017-03-13 10:36:58 -04:00
Brad King 60546b4829 Help: Cross-reference generator toolset variables 2017-03-13 10:36:58 -04:00
Brad King 35c5cddcc5 Help: Cross-reference generator platform variables 2017-03-13 10:36:58 -04:00
Brad King 7df38939f9 Help: Move generator toolset support details to variable docs
Move the details about support for generator toolset specification
to the `CMAKE_GENERATOR_TOOLSET` variable documentation.  This is
a more suitable place because it is shared by all means to set this
variable, not just the `cmake -T` option.
2017-03-13 10:36:58 -04:00
Brad King c750b28220 Help: Move generator platform support details to variable docs
Move the details about support for generator platform specification
to the `CMAKE_GENERATOR_PLATFORM` variable documentation.  This is
a more suitable place because it is shared by all means to set this
variable, not just the `cmake -A` option.
2017-03-13 10:36:57 -04:00
Brad King 10f444a5c6 Merge topic 'doc-toolset-host-arch-typo'
81b24547 Help: Fix typo in CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !579
2017-03-13 10:36:25 -04:00
Brad King f2d250adf0 Merge branch 'doc-toolset-host-arch-typo' into release 2017-03-13 10:33:44 -04:00
Brad King 81b2454757 Help: Fix typo in CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE 2017-03-13 10:32:50 -04:00
Brad King 9e226d96ad Merge topic 'cuda-vs'
2a1f3dff Help: Add notes for topic 'cuda-vs'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !578
2017-03-13 09:07:36 -04:00
Brad King 2a1f3dff6f Help: Add notes for topic 'cuda-vs' 2017-03-13 09:05:46 -04:00
Brad King 053475aff7 Merge branch 'release' 2017-03-13 09:01:51 -04:00
Brad King 2591e89c14 Merge topic 'x32-abi-tests'
7a2de256 Tests: Fix CMakeOnly.find_library test logic for libx32 case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !573
2017-03-13 09:00:52 -04:00
Brad King 3806e186d1 Merge topic 'BundleUtilities-elf-rpath'
10fcef02 BundleUtilities: Fix bundle verification on Unix by considering rpaths.
ac0786cb BundleUtilities: Teach `get_item_rpaths` to parse ELF binaries
a52faa1f file: Add READ_ELF command to parse ELF binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !551
2017-03-13 08:59:59 -04:00
Brad King 22908e4be8 Merge topic 'xcode-test-schema-generation'
3fd9f4ab Xcode: Add test for schema generation
cf13e495 Xcode: Control schema generation via variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !577
2017-03-13 08:58:50 -04:00
Brad King b46fa35824 Merge topic 'cuda-vs'
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
2017-03-13 08:57:57 -04:00
Brad King abfc55a362 Merge topic 'refactor-module-def'
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
2017-03-13 08:57:20 -04:00
Brad King abbc0b839f Merge topic 'update-kwsys'
83be64d9 Merge branch 'upstream-KWSys' into update-kwsys
8ba8b553 KWSys 2017-03-07 (5da8cfe0)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !576
2017-03-13 08:42:04 -04:00
Brad King ff5188481a Merge topic 'FindGit-avoid-vs-2017-git'
c4d481e5 FindGit: Avoid finding VS 2017 non-general Git installation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !575
2017-03-13 08:41:24 -04:00
Kitware Robot ac59ec7dc1 CMake Nightly Date Stamp 2017-03-13 00:01:02 -04:00
Gregor Jasny 3fd9f4ab05 Xcode: Add test for schema generation
Closes: #15441
2017-03-12 21:27:53 +01:00
Gregor Jasny cf13e49544 Xcode: Control schema generation via variable
Issue: #15441
2017-03-12 21:24:46 +01:00
Kitware Robot ce0704e419 CMake Nightly Date Stamp 2017-03-12 00:01:03 -05:00
Kitware Robot 6a4e189b68 CMake Nightly Date Stamp 2017-03-11 00:01:04 -05:00
Brad King 83be64d99c Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2017-03-07 (5da8cfe0)
2017-03-10 16:24:53 -05:00
KWSys Upstream 8ba8b5537c KWSys 2017-03-07 (5da8cfe0)
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
2017-03-10 16:24:52 -05:00
Brad King 4aca67b0fb Merge branch 'FindGit-avoid-vs-2017-git' into release 2017-03-10 16:13:05 -05:00
Brad King c4d481e5b8 FindGit: Avoid finding VS 2017 non-general Git installation
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
2017-03-10 16:09:31 -05:00
Christian Schmidbauer 7a2de256c4 Tests: Fix CMakeOnly.find_library test logic for libx32 case
Teach `test_find_library_subst` how to convert `libx32` to `lib`
so that the test case actually covers what we intend it to.
2017-03-10 15:50:25 -05:00
Brad King 0b2438118a Merge topic 'GNU-FindBinUtils-no-policy'
8fc934de GNU-FindBinUtils: Avoid setting policy CMP0054

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !572
2017-03-10 11:00:49 -05:00
Florian Apolloner 10fcef0275 BundleUtilities: Fix bundle verification on Unix by considering rpaths. 2017-03-10 10:59:16 -05:00
Florian Apolloner ac0786cb9a BundleUtilities: Teach get_item_rpaths to parse ELF binaries 2017-03-10 10:59:07 -05:00
Florian Apolloner a52faa1fcb file: Add READ_ELF command to parse ELF binaries
Leave it undocumented for now because we intend to use it internally and
it cannot be made available everywhere.
2017-03-10 10:54:53 -05:00
Brad King 8fc934de0e GNU-FindBinUtils: Avoid setting policy CMP0054
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.
2017-03-10 10:46:11 -05:00
Brad King 65481a60a0 CUDA: Work around VS limitation in CudaOnly.WithDefs test
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.
2017-03-10 10:19:58 -05:00
Brad King 8cae24a1d0 VS: Add more CUDA flag table entries 2017-03-10 10:19:57 -05:00
Brad King 6ca4f22292 VS: Add support for the CUDA_SEPARABLE_COMPILATION property 2017-03-10 10:19:57 -05:00
Brad King 94255511a6 VS: Select CUDA code generation architectures
Parse the `-gencode=`, `-arch`, and `-code` flags and generate a
`CodeGeneration` field in the project file.
2017-03-10 10:19:57 -05:00
Brad King 253594d0ae VS: Select the CUDA runtime library
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.
2017-03-10 10:19:57 -05:00
Brad King 4def02a385 VS: Place CUDA host compiler options in proper project file fields
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.
2017-03-10 10:19:56 -05:00
Brad King 29f07b0867 VS: Do not pass CUDA compile options to C compiler 2017-03-10 10:19:56 -05:00
Brad King b966f489c1 VS: Do not use absolute paths to CUDA sources
The CUDA Toolkit's VS integration does not properly compute the
intermediate files directory location when the path to the source
file is absolute.
2017-03-10 10:19:56 -05:00