Commit Graph

34737 Commits

Author SHA1 Message Date
Brad King f10b2f72f6 ctest_update: Capture failure of svn to load revisions and local mods
Issue: #16646
2017-02-16 13:19:26 -05:00
Brad King ef399f9bc6 ctest_update: Refactor internal APIs to support more failure cases
Thread failure of VC tool commands through more APIs so that we can
detect when they fail.  Defer updating of the individual VC tool usage
the future and just return true from them for now.
2017-02-16 13:19:26 -05:00
Brad King bb4730dc5a Merge topic 'vs-refactor-unknown-flags'
109b8a6f VS: Refactor AdditionalOptions generation
bd5ea699 cmVisualStudioGeneratorOptions: Add PrependInerhitedString method
3936a288 cmIDEOptions: Add SpaceAppendable flag table type
2017-02-16 13:15:52 -05:00
Brad King 160083b04d Merge topic 'vs-refactor-toolset-parsing'
f773933f VS: Refactor generator toolset parsing
d9e2b9a9 Tests: Split out RunCMake.GeneratorToolset Xcode checks
2017-02-16 13:15:49 -05:00
Brad King fb3fd78d58 Merge topic 'TestBigEndian-cxx-only'
ac0962ce TestBigEndian: Fix to work with CXX without C
2017-02-16 13:15:47 -05:00
Brad King 60b5616af7 Merge topic 'command-cleanup-fix'
20ae76b1 cmDisallowedCommand: Forward final pass too
2017-02-16 13:15:44 -05:00
Brad King aa18d5befe Merge topic 'fix-ctest_update-svn'
51849bba ctest_update: Fix svn log and external loading
2017-02-16 13:15:42 -05:00
Brad King 5d5be3bd96 Merge topic 'autogen_fix_3.8'
28ee3784 Autogen: Fix headers not skipped
2017-02-16 13:15:38 -05:00
Brad King d1530cc9a5 Merge topic 'cuda-msvc-flags'
55fb46d2 CUDA: Fix default compiler flags on Windows
d7c80f60 CUDA: Fix test cases to not override CUDA flags
2017-02-16 13:15:35 -05:00
Kitware Robot b9229944cf CMake Nightly Date Stamp 2017-02-16 00:01:10 -05:00
Uwe Koloska ac0962cead TestBigEndian: Fix to work with CXX without C 2017-02-15 15:08:37 -05:00
Sebastian Holtermann 28ee378405 Autogen: Fix headers not skipped 2017-02-15 21:00:39 +01:00
Brad King 51849bbab8 ctest_update: Fix svn log and external loading
Since commit v3.7.0-rc1~132^2 (CTestSVN: Fix segfault when
CTEST_UPDATE_VERSION_ONLY is enabled, 2016-09-12) we do not properly
extract svn log or externals.  After updating we erase the information
that was loaded before updating and can no longer log the changes
between revisions to extract authors.

Fix this by only loading the repository information once, whether needed
by `NoteOldRevision`, `NoteNewRevision`, or both.

Fixes: #12630, #16646
2017-02-15 14:44:37 -05:00
Brad King 55fb46d273 CUDA: Fix default compiler flags on Windows
Fix the default values of `CMAKE_CUDA_FLAGS[_<CONFIG>]` on Windows to
make the host compiler flags match those produced for C++ by the
`Platform/Windows-MSVC` module.  This makes the flags consistent with
those used for C++.
2017-02-15 11:12:12 -05:00
Brad King d7c80f6036 CUDA: Fix test cases to not override CUDA flags
Append to `CMAKE_CUDA_FLAGS` instead of overwriting it.
2017-02-15 11:12:09 -05:00
Brad King 109b8a6fd3 VS: Refactor AdditionalOptions generation
Store unknown flags directly in a flag map entry for `AdditionalOptions`
instead of having a separate member for them.  This avoids duplicating
the output generation logic for the entry.
2017-02-15 10:41:36 -05:00
Brad King bd5ea6993c cmVisualStudioGeneratorOptions: Add PrependInerhitedString method 2017-02-15 10:37:35 -05:00
Brad King 3936a2886e cmIDEOptions: Add SpaceAppendable flag table type 2017-02-15 10:36:09 -05:00
Brad King 20ae76b1da cmDisallowedCommand: Forward final pass too
Refactoring in commit 7fb14775 (cmDisallowedCommand: extract policy
checking from cmCommand, 2016-12-26) introduced a wrapper for
disallowed commands that forwards to their original commands.
This broke the `export_library_dependencies` command that uses
a final pass.  Forward the final pass too to fix it.
2017-02-15 09:22:22 -05:00
Brad King 72cfb3c3d2 Merge branch 'release' 2017-02-15 08:25:35 -05:00
Brad King 8ff8766232 Merge topic 'vs-refactor-libs'
8ba6dc36 VS: Place CMAKE_<LANG>_STANDARD_LIBRARIES after other libraries
1d04d2ce VS: Refactor parsing of CMAKE_<LANG>_STANDARD_LIBRARIES
2017-02-15 08:24:13 -05:00
Brad King 6a5e5a9268 Merge topic 'vs-dedup-tag'
f7e5c682 VS: De-duplicate PreprocessorDefinitions tag name
2017-02-15 08:24:10 -05:00
Brad King 99ca1e27e2 Merge topic 'cuda-drop-comment'
7c29a0c8 CMakeDetermineCUDACompiler: Drop out-of-date comment
2017-02-15 08:24:07 -05:00
Brad King e853dfed6a Merge topic 'cuda-with-c'
1c60231c CUDA: Link to standard system libraries when linking as CUDA
8d75d8dc Tests: Add case for CUDA with C but not C++
2017-02-15 08:24:05 -05:00
Brad King 8ba5c21db7 Merge topic 'cuda-no-Os'
59ed323d CUDA: Do not use non-existent -Os flag for nvcc
2017-02-15 08:24:02 -05:00
Brad King 75040fc103 Merge topic 'update-kwsys'
ff843dbd Merge branch 'upstream-KWSys' into update-kwsys
ced3396d KWSys 2017-02-14 (5c6f7836)
2017-02-15 08:24:00 -05:00
Brad King f773933f26 VS: Refactor generator toolset parsing
We parse `CMAKE_GENERATOR_TOOLSET` values of the forms:

* `toolset`
* `toolset,host=x64`
* `host=x64`

Generalize the parsing to support the forms:

* `toolset`
* `toolset[,key=value]*`
* `key=value[,key=value]*`

Disallow duplicate keys.  Require all but the first field to
be of `key=value` form.
2017-02-15 08:15:37 -05:00
Brad King d9e2b9a909 Tests: Split out RunCMake.GeneratorToolset Xcode checks
This will allow the behavior of VS and Xcode generators to differ.
2017-02-15 08:15:00 -05:00
Kitware Robot 8b155a6c09 CMake Nightly Date Stamp 2017-02-15 00:01:04 -05:00
Brad King 272c348d5a Merge branch 'cuda-no-Os' into release 2017-02-14 15:25:23 -05:00
Brad King 59ed323d46 CUDA: Do not use non-existent -Os flag for nvcc
Fix the CUDA MinSizeRel configuration flags to avoid using the `-Os`
flag that nvcc does not support.
2017-02-14 14:49:53 -05:00
Brad King 7c29a0c860 CMakeDetermineCUDACompiler: Drop out-of-date comment 2017-02-14 13:40:20 -05:00
Brad King f7e5c6820a VS: De-duplicate PreprocessorDefinitions tag name
Store the name in a variable for re-use.
2017-02-14 13:37:54 -05:00
Brad King 8ba6dc362d VS: Place CMAKE_<LANG>_STANDARD_LIBRARIES after other libraries
Make the VS generator consistent with the Ninja and Makefile generators
that place the libraries listed in this variable after other libraries
on the link command line.  These system libraries never depend on the
project libraries.
2017-02-14 11:21:08 -05:00
Brad King 1d04d2ce36 VS: Refactor parsing of CMAKE_<LANG>_STANDARD_LIBRARIES
Parse the value as a command line string just as the MS CRT would.
This makes the VS generator behavior consistent with how the string
is used by the Ninja and Makefile generators.
2017-02-14 11:15:08 -05:00
Brad King 81ebf4be3e Merge branch 'cuda-with-c' into release 2017-02-14 10:47:01 -05:00
Brad King 34ce3017b5 Merge branch 'release' 2017-02-14 10:38:52 -05:00
Brad King 5af61d446d Merge topic 'clang-format-cuda'
1009e1d7 Merge branch 'backport-clang-format-cuda' into clang-format-cuda
33a65941 Tests: Run clang-format on CUDA code
fa5188d0 Merge branch 'backport-clang-format-cuda' into clang-format-cuda
c4a61350 Tests: Run clang-format on CUDA code
0b2f8ae3 Modules: Run clang-format on CUDA code
592e3d2f clang-format.bash: Format CUDA source files too
2017-02-14 10:37:57 -05:00
Brad King 1c60231ca5 CUDA: Link to standard system libraries when linking as CUDA
On Windows with MSVC-like host compilers we must honor the standard
libraries chosen by the `Platform/Windows-MSVC` module.  Otherwise C
code linked into the CUDA binary that expects to have these libraries
available may not link.
2017-02-14 10:34:15 -05:00
Brad King 8d75d8dc72 Tests: Add case for CUDA with C but not C++
An executable using CUDA and C should link as CUDA.
2017-02-14 10:34:06 -05:00
Brad King f45e3b9509 Merge branch 'backport-clang-format-cuda' into release 2017-02-14 10:22:43 -05:00
Brad King 1009e1d708 Merge branch 'backport-clang-format-cuda' into clang-format-cuda 2017-02-14 10:22:22 -05:00
Brad King 33a65941fa Tests: Run clang-format on CUDA code 2017-02-14 10:21:48 -05:00
Brad King fa5188d0ed Merge branch 'backport-clang-format-cuda' into clang-format-cuda 2017-02-14 10:21:22 -05:00
Brad King c4a6135039 Tests: Run clang-format on CUDA code 2017-02-14 10:20:50 -05:00
Brad King 0b2f8ae3ba Modules: Run clang-format on CUDA code 2017-02-14 10:20:42 -05:00
Brad King 592e3d2f96 clang-format.bash: Format CUDA source files too
Add `.clang-format` configuration files for Cuda test directories that
use `Standard: Cpp11`.  Otherwise clang-format splits the triple angle
brackets used for CUDA kernels.
2017-02-14 10:20:23 -05:00
Brad King ff843dbd54 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2017-02-14 (5c6f7836)
2017-02-14 09:22:07 -05:00
KWSys Upstream ced3396d04 KWSys 2017-02-14 (5c6f7836)
Code extracted from:

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

at commit 5c6f78360d93742bace501bef0c45664d317972a (master).

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

Brad King (1):
      a673a722 SystemInformation: Fix -Wconversion warning

Nicolás Bértolo (1):
      9c4230b7 SystemInformation: Fix counts of logical and physical cores
2017-02-14 09:22:06 -05:00
Brad King 03be8ccbf6 Merge branch 'release' 2017-02-14 08:33:03 -05:00