summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* VS: Refactor AdditionalOptions generationBrad King2017-02-155-41/+9
| | | | | | 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.
* cmVisualStudioGeneratorOptions: Add PrependInerhitedString methodBrad King2017-02-152-0/+13
|
* cmIDEOptions: Add SpaceAppendable flag table typeBrad King2017-02-153-0/+22
|
* Merge branch 'release'Brad King2017-02-150-0/+0
|\
| * Merge branch 'cuda-no-Os' into releaseBrad King2017-02-141-1/+1
| |\
| * \ Merge branch 'cuda-with-c' into releaseBrad King2017-02-146-0/+51
| |\ \
* | \ \ Merge topic 'vs-refactor-libs'Brad King2017-02-151-20/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 8ba6dc36 VS: Place CMAKE_<LANG>_STANDARD_LIBRARIES after other libraries 1d04d2ce VS: Refactor parsing of CMAKE_<LANG>_STANDARD_LIBRARIES
| * | | | VS: Place CMAKE_<LANG>_STANDARD_LIBRARIES after other librariesBrad King2017-02-141-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | VS: Refactor parsing of CMAKE_<LANG>_STANDARD_LIBRARIESBrad King2017-02-141-14/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge topic 'vs-dedup-tag'Brad King2017-02-151-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f7e5c682 VS: De-duplicate PreprocessorDefinitions tag name
| * | | | | VS: De-duplicate PreprocessorDefinitions tag nameBrad King2017-02-141-5/+5
| |/ / / / | | | | | | | | | | | | | | | Store the name in a variable for re-use.
* | | | | Merge topic 'cuda-drop-comment'Brad King2017-02-151-7/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7c29a0c8 CMakeDetermineCUDACompiler: Drop out-of-date comment
| * | | | | CMakeDetermineCUDACompiler: Drop out-of-date commentBrad King2017-02-141-7/+0
| |/ / / /
* | | | | Merge topic 'cuda-with-c'Brad King2017-02-156-0/+51
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | 1c60231c CUDA: Link to standard system libraries when linking as CUDA 8d75d8dc Tests: Add case for CUDA with C but not C++
| * | | | CUDA: Link to standard system libraries when linking as CUDABrad King2017-02-143-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Tests: Add case for CUDA with C but not C++Brad King2017-02-144-0/+35
| | | | | | | | | | | | | | | | | | | | An executable using CUDA and C should link as CUDA.
* | | | | Merge topic 'cuda-no-Os'Brad King2017-02-151-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | 59ed323d CUDA: Do not use non-existent -Os flag for nvcc
| * | | | CUDA: Do not use non-existent -Os flag for nvccBrad King2017-02-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Fix the CUDA MinSizeRel configuration flags to avoid using the `-Os` flag that nvcc does not support.
* | | | | Merge topic 'update-kwsys'Brad King2017-02-152-182/+66
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff843dbd Merge branch 'upstream-KWSys' into update-kwsys ced3396d KWSys 2017-02-14 (5c6f7836)
| * \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-02-142-182/+66
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-02-14 (5c6f7836)
| | * | | | | KWSys 2017-02-14 (5c6f7836)KWSys Upstream2017-02-142-182/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | CMake Nightly Date StampKitware Robot2017-02-151-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | 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