summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ctest_update: Refactor internal APIs to support more failure casesBrad King2017-02-1615-57/+80
| | | | | | 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.
* Merge topic 'vs-refactor-unknown-flags'Brad King2017-02-167-41/+44
|\ | | | | | | | | | | | | 109b8a6f VS: Refactor AdditionalOptions generation bd5ea699 cmVisualStudioGeneratorOptions: Add PrependInerhitedString method 3936a288 cmIDEOptions: Add SpaceAppendable flag table type
| * 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 topic 'vs-refactor-toolset-parsing'Brad King2017-02-1615-29/+130
|\ \ | | | | | | | | | | | | | | | f773933f VS: Refactor generator toolset parsing d9e2b9a9 Tests: Split out RunCMake.GeneratorToolset Xcode checks
| * | 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 topic 'TestBigEndian-cxx-only'Brad King2017-02-161-7/+19
|\ \ \ | | | | | | | | | | | | | | | | ac0962ce TestBigEndian: Fix to work with CXX without C
| * | | TestBigEndian: Fix to work with CXX without CUwe Koloska2017-02-151-7/+19
| | |/ | |/|
* | | Merge topic 'command-cleanup-fix'Brad King2017-02-161-0/+7
|\ \ \ | | | | | | | | | | | | | | | | 20ae76b1 cmDisallowedCommand: Forward final pass too
| * | | cmDisallowedCommand: Forward final pass tooBrad King2017-02-151-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge topic 'fix-ctest_update-svn'Brad King2017-02-161-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 51849bba ctest_update: Fix svn log and external loading
| * | | | ctest_update: Fix svn log and external loadingBrad King2017-02-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge topic 'autogen_fix_3.8'Brad King2017-02-161-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 28ee3784 Autogen: Fix headers not skipped
| * | | | | Autogen: Fix headers not skippedSebastian Holtermann2017-02-151-2/+2
| | | | | |
* | | | | | Merge topic 'cuda-msvc-flags'Brad King2017-02-167-16/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55fb46d2 CUDA: Fix default compiler flags on Windows d7c80f60 CUDA: Fix test cases to not override CUDA flags
| * | | | | | CUDA: Fix default compiler flags on WindowsBrad King2017-02-152-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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++.
| * | | | | | CUDA: Fix test cases to not override CUDA flagsBrad King2017-02-155-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Append to `CMAKE_CUDA_FLAGS` instead of overwriting it.
* | | | | | | CMake Nightly Date StampKitware Robot2017-02-161-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | 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
| |\ \ \ \ \ \ \