Commit Graph

34717 Commits

Author SHA1 Message Date
Uwe Koloska
ac0962cead TestBigEndian: Fix to work with CXX without C 2017-02-15 15:08:37 -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
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
Brad King
dc58d9f06d Merge topic 'command-cleanup'
e0f39312 cmCommands: add commands directly to cmState
72dcbbe5 split Default commands into Scripting and Project
7fb14775 cmDisallowedCommand: extract policy checking from cmCommand
615e2a17 cmCommand: Don't prefix error message with command name
45b49099 cmCommand: make noncopyable
5396bc92 cmCommand: remove member Helper
2017-02-14 08:30:33 -05:00
Brad King
b7d8d80a62 Merge topic 'cmake_provide_include_dir_for_toolkit'
44f3acb2 CUDA: Detect the toolkit include directories
2017-02-14 08:30:30 -05:00
Brad King
31e96ccca2 Merge topic 'execute_process-default-encoding'
07c3380a execute_process: Restore no-decoding default behavior
4168bc18 Help: Improve execute_process ENCODING option documentation
2017-02-14 08:30:27 -05:00
Kitware Robot
11e9605179 CMake Nightly Date Stamp 2017-02-14 00:01:05 -05:00
Daniel Pfeifer
e0f3931226 cmCommands: add commands directly to cmState 2017-02-13 22:39:20 +01:00
Daniel Pfeifer
72dcbbe5c0 split Default commands into Scripting and Project 2017-02-13 22:32:55 +01:00
Daniel Pfeifer
7fb14775a3 cmDisallowedCommand: extract policy checking from cmCommand
Implement cmDisallowedCommand as a wrapper class for cmCommand.
2017-02-13 21:37:08 +01:00
Daniel Pfeifer
615e2a17e4 cmCommand: Don't prefix error message with command name
Instead, prefix the error message at the two places where the errors are
handled: cmMakefile and cmCTestHandlerCommand.
2017-02-13 20:49:20 +01:00
Daniel Pfeifer
45b49099d9 cmCommand: make noncopyable 2017-02-13 20:48:29 +01:00
Daniel Pfeifer
5396bc92d0 cmCommand: remove member Helper
The Helper member is used in a single derived class only.
Remove it from the base class to the only place where it is used.
2017-02-13 20:48:29 +01:00
Brad King
f0e5954fce Merge branch 'execute_process-default-encoding' into release 2017-02-13 14:05:36 -05:00
Brad King
07c3380a6e execute_process: Restore no-decoding default behavior
Since commit v3.8.0-rc1~232^2 (execute_process: Add ENCODING option for
Windows child process output, 2016-11-23) we decode child process output
using the console's active codepage by default.  This differs from
previous versions of CMake and is therefore incompatible.  Changing this
default will require a policy, so for now revert the default behavior
back to performing no decoding.

Reported-by: Nils Gladitz <nilsgladitz@gmail.com>
2017-02-13 13:53:17 -05:00
Brad King
4168bc184e Help: Improve execute_process ENCODING option documentation
Spell out the options in a definition list and document each one.
2017-02-13 13:53:17 -05:00
Brad King
38bfe65eba Merge branch 'release' 2017-02-13 11:45:41 -05:00
Brad King
bcd28f04b1 Merge branch 'cmake_provide_include_dir_for_toolkit' into release 2017-02-13 11:45:07 -05:00
Brad King
7da1cde3ae Merge topic 'cuda_tests_improve_error_reporting'
166b3393 Tests/Cuda: Select a CUDA device supporting compute 3.0
cbe4d595 Tests/Cuda: Return a non-zero code if errors occurred
8731701c Tests/Cuda: Use memory allocated on the GPU in the kernels
0ae5386a Tests/Cuda: Add missing separable compilation property
ce19607f Tests/Cuda: Fix missing CUDA static library at runtime on macOS
008ed80d Tests/Cuda: Output error messages to std::cerr instead of std::cout
c0d7bb83 Tests/Cuda: Print asynchronous error messages, if any
21a125cd Tests/Cuda: Print error message if mixed_kernel failed
eebb2be8 Tests/Cuda: Add identifiers to error messages
84f3c87b Tests/Cuda: Print error message if an error occurred
2017-02-13 11:41:49 -05:00
Brad King
0c4379353f Merge topic 'erase-if'
c3800e54 cmAlgorithms: add cmEraseIf function
2017-02-13 11:41:46 -05:00
Kitware Robot
0cab748cf8 CMake Nightly Date Stamp 2017-02-13 00:01:04 -05:00
Kitware Robot
26662fc3d3 CMake Nightly Date Stamp 2017-02-12 00:01:04 -05:00
Kitware Robot
6c8d659631 CMake Nightly Date Stamp 2017-02-11 00:01:08 -05:00