Commit Graph

34698 Commits

Author SHA1 Message Date
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 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 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 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
Daniel Pfeifer c3800e5458 cmAlgorithms: add cmEraseIf function 2017-02-10 23:04:32 +01:00
Robert Maynard 44f3acb202 CUDA: Detect the toolkit include directories
The `nvcc -v` output provides what include directories need to be added
to use the CUDA toolkit from other languages ( C/C++ ).
2017-02-10 16:08:06 -05:00
Pierre Moreau 166b339387 Tests/Cuda: Select a CUDA device supporting compute 3.0 2017-02-10 13:47:05 -05:00
Pierre Moreau cbe4d5957b Tests/Cuda: Return a non-zero code if errors occurred 2017-02-10 13:46:42 -05:00
Pierre Moreau 8731701cb6 Tests/Cuda: Use memory allocated on the GPU in the kernels 2017-02-10 13:46:08 -05:00
Pierre Moreau 0ae5386aa9 Tests/Cuda: Add missing separable compilation property
This resulted in `mixed_kernel()` returning an "invalid device function"
at runtime for `file1_func()`.

Suggested-by: Robert Maynard
2017-02-10 13:46:08 -05:00
Pierre Moreau ce19607fed Tests/Cuda: Fix missing CUDA static library at runtime on macOS
Suggested-by: Robert Maynard
2017-02-10 13:46:07 -05:00
Pierre Moreau 008ed80dcf Tests/Cuda: Output error messages to std::cerr instead of std::cout 2017-02-10 13:46:07 -05:00
Pierre Moreau c0d7bb8368 Tests/Cuda: Print asynchronous error messages, if any
As kernel launches are asynchronous, a `cudaGetLastError()` right after
the kernel launch might be executed while the kernel is still running.
Synchronizing the device will ensure that all the work is completed
before progressing further on, and allows to catch errors that were
previously missed.
The `cudaGetLastError()` after the `cudaDeviceSynchronize()` is there
to reset the error variable to `cudaSuccess`.
2017-02-10 13:46:07 -05:00
Pierre Moreau 21a125cdbf Tests/Cuda: Print error message if mixed_kernel failed 2017-02-10 13:46:06 -05:00
Pierre Moreau eebb2be8b0 Tests/Cuda: Add identifiers to error messages 2017-02-10 13:46:06 -05:00
Pierre Moreau 84f3c87b03 Tests/Cuda: Print error message if an error occurred
Fixes c59811a2 "CUDA: Tests now state why they are failing when no CUDA card is found."
2017-02-10 13:46:06 -05:00
Brad King ee3295e917 Merge topic 'vs-nasm'
5ba2c9e5 VS: Add support for ASM_NASM language
2017-02-10 13:36:18 -05:00
Brad King 0a30938848 Merge topic 'ExtractGTestMacro'
9837ed96 GoogleTest: Add module to contain gtest_add_tests independently
2017-02-10 13:36:14 -05:00
Brad King bb72fff2f0 Merge topic 'update-curl'
d4da4755 Help: Add notes for topic 'update-curl'
14c77153 Tests: Fix `file://` URLs given to curl
73ae6700 curl: Fix passing _WINSOCKAPI_ macro to compiler
1df9d5f9 Merge branch 'upstream-curl' into update-curl
4cc2908f curl 2016-12-22 (44b9b4d4)
f4a3290a curl: Update script to get curl 7.52.1
2017-02-10 13:36:11 -05:00
Brad King f236c9cff9 Merge topic 'gcc-cpp98'
e2ee0971 g++ knows about C++98 selection flags since at least 3.4
2017-02-10 13:36:09 -05:00
Brad King d4da4755cd Help: Add notes for topic 'update-curl' 2017-02-10 13:10:07 -05:00
Brad King 14c771530a Tests: Fix file:// URLs given to curl
Since upstream curl commit curl-7_52_0~131 (URL-parser: for
file://[host]/ URLs, the [host] must be localhost, 2016-11-11) we can no
longer use URLs of the form `file://c:/...` on Windows.  These worked
only accidentally before.  Use `file:///c:/...` instead.
2017-02-10 13:10:07 -05:00
Brad King 46c6489850 Merge topic 'sphinx-1.4'
30abf145 Help: Fix cmake code block warnings produced by Sphinx 1.4
97917900 Utilities/Sphinx: Port qthelp css workaround to Sphinx 1.4
971384c2 Utilities/Sphinx: Port cmake extension to Sphinx 1.4
2017-02-10 11:32:21 -05:00