summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* VS: Refactor generator toolset parsingBrad King2017-02-1512-28/+112
| | | | | | | | | | | | | | | | | 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.
* Tests: Split out RunCMake.GeneratorToolset Xcode checksBrad King2017-02-154-1/+18
| | | | This will allow the behavior of VS and Xcode generators to differ.
* Merge branch 'release'Brad King2017-02-140-0/+0
|\
| * Merge branch 'backport-clang-format-cuda' into releaseBrad King2017-02-1420-88/+79
| |\
* | \ Merge topic 'clang-format-cuda'Brad King2017-02-1420-135/+111
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ Merge branch 'backport-clang-format-cuda' into clang-format-cudaBrad King2017-02-140-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | Tests: Run clang-format on CUDA codeBrad King2017-02-1416-86/+59
| | | |
| * | | Tests: Run clang-format on CUDA codeBrad King2017-02-1416-133/+91
| | | |
| * | | Merge branch 'backport-clang-format-cuda' into clang-format-cudaBrad King2017-02-144-2/+20
| |\ \ \ |/ / / / | | _ / | | /
| * | Modules: Run clang-format on CUDA codeBrad King2017-02-141-1/+1
| | |
| * | clang-format.bash: Format CUDA source files tooBrad King2017-02-143-1/+19
| | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'release'Brad King2017-02-140-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'execute_process-default-encoding' into releaseBrad King2017-02-132-5/+16
| |\ \
| * \ \ Merge branch 'cmake_provide_include_dir_for_toolkit' into releaseBrad King2017-02-138-4/+71
| |\ \ \ | | | |/ | | |/|
* | | | Merge topic 'command-cleanup'Brad King2017-02-1421-257/+313
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | cmCommands: add commands directly to cmStateDaniel Pfeifer2017-02-133-133/+113
| | | | |
| * | | | split Default commands into Scripting and ProjectDaniel Pfeifer2017-02-135-108/+142
| | | | |
| * | | | cmDisallowedCommand: extract policy checking from cmCommandDaniel Pfeifer2017-02-1314-70/+111
| | | | | | | | | | | | | | | | | | | | Implement cmDisallowedCommand as a wrapper class for cmCommand.
| * | | | cmCommand: Don't prefix error message with command nameDaniel Pfeifer2017-02-133-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | Instead, prefix the error message at the two places where the errors are handled: cmMakefile and cmCTestHandlerCommand.
| * | | | cmCommand: make noncopyableDaniel Pfeifer2017-02-131-0/+4
| | | | |
| * | | | cmCommand: remove member HelperDaniel Pfeifer2017-02-132-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge topic 'cmake_provide_include_dir_for_toolkit'Brad King2017-02-148-4/+71
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | 44f3acb2 CUDA: Detect the toolkit include directories
| * | | | CUDA: Detect the toolkit include directoriesRobert Maynard2017-02-108-4/+71
| | | | | | | | | | | | | | | | | | | | | | | | | The `nvcc -v` output provides what include directories need to be added to use the CUDA toolkit from other languages ( C/C++ ).
* | | | | Merge topic 'execute_process-default-encoding'Brad King2017-02-142-5/+16
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | 07c3380a execute_process: Restore no-decoding default behavior 4168bc18 Help: Improve execute_process ENCODING option documentation
| * | | | execute_process: Restore no-decoding default behaviorBrad King2017-02-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | Help: Improve execute_process ENCODING option documentationBrad King2017-02-131-4/+15
| | | | | | | | | | | | | | | | | | | | Spell out the options in a definition list and document each one.
* | | | | CMake Nightly Date StampKitware Robot2017-02-141-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'release'Brad King2017-02-130-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'sphinx-1.4' into releaseBrad King2017-02-106-17/+25
| |\ \ \ | | |/ / | | | / | | |/ | |/|
* | | Merge topic 'cuda_tests_improve_error_reporting'Brad King2017-02-137-21/+141
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Tests/Cuda: Select a CUDA device supporting compute 3.0Pierre Moreau2017-02-102-0/+46
| | | |
| * | | Tests/Cuda: Return a non-zero code if errors occurredPierre Moreau2017-02-102-6/+8
| | | |
| * | | Tests/Cuda: Use memory allocated on the GPU in the kernelsPierre Moreau2017-02-102-10/+45
| | | |
| * | | Tests/Cuda: Add missing separable compilation propertyPierre Moreau2017-02-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This resulted in `mixed_kernel()` returning an "invalid device function" at runtime for `file1_func()`. Suggested-by: Robert Maynard
| * | | Tests/Cuda: Fix missing CUDA static library at runtime on macOSPierre Moreau2017-02-101-0/+6
| | | | | | | | | | | | | | | | Suggested-by: Robert Maynard
| * | | Tests/Cuda: Output error messages to std::cerr instead of std::coutPierre Moreau2017-02-101-2/+2
| | | |
| * | | Tests/Cuda: Print asynchronous error messages, if anyPierre Moreau2017-02-103-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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`.
| * | | Tests/Cuda: Print error message if mixed_kernel failedPierre Moreau2017-02-101-0/+7
| | | |
| * | | Tests/Cuda: Add identifiers to error messagesPierre Moreau2017-02-102-2/+4
| | | |
| * | | Tests/Cuda: Print error message if an error occurredPierre Moreau2017-02-102-2/+2
| | | | | | | | | | | | | | | | Fixes c59811a2 "CUDA: Tests now state why they are failing when no CUDA card is found."
* | | | Merge topic 'erase-if'Brad King2017-02-135-29/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | c3800e54 cmAlgorithms: add cmEraseIf function
| * | | | cmAlgorithms: add cmEraseIf functionDaniel Pfeifer2017-02-105-29/+16
| |/ / /
* | | | CMake Nightly Date StampKitware Robot2017-02-131-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2017-02-121-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2017-02-111-1/+1
|/ / /
* | | Merge topic 'vs-nasm'Brad King2017-02-1020-4/+415
|\ \ \ | | | | | | | | | | | | | | | | 5ba2c9e5 VS: Add support for ASM_NASM language
| * | | VS: Add support for ASM_NASM languageEvgeny Fimochkin2017-02-0720-4/+415
| | | | | | | | | | | | | | | | Fixes: #16469
* | | | Merge topic 'ExtractGTestMacro'Brad King2017-02-105-57/+83
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 9837ed96 GoogleTest: Add module to contain gtest_add_tests independently
| * | | | GoogleTest: Add module to contain gtest_add_tests independentlyBradley Lowekamp2017-02-075-57/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract the `gtest_add_tests` macro from `FindGTest` into a separate module. GTest or GoogleTest can be used by a project in a several different ways, including installed libraries in the system, from an ExternalProject, or adding the GTest source directory as a sub directory of the project. As not all of these uses are supported by the FindGTest module the useful `gtest_add_tests` macro is separated to easily enable reuse. Issue: #14151
* | | | | Merge topic 'update-curl'Brad King2017-02-10139-2517/+4188
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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