summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-04-153-11/+16
|\ | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-04-15 (5ada375f)
| * KWSys 2020-04-15 (5ada375f)KWSys Upstream2020-04-153-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 5ada375fcf564e837672eecbca2d522105daebf1 (master). Upstream Shortlog ----------------- Ben Boeckel (3): 83b20b65 clang-tidy: address `readability-braces-around-statements` lint 535633fa clang-tidy: address `readability-isolate-declaration` lint de210648 clang-tidy: address `readability-else-after-return` lint
* | CMake Nightly Date StampKitware Robot2020-04-151-1/+1
| |
* | Merge topic 'sort_list_natural_20563'Brad King2020-04-144-2/+56
|\ \ | | | | | | | | | | | | | | | | | | da99eca1e7 list: add NATURAL sorting on SORT sub-command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4602
| * | list: add NATURAL sorting on SORT sub-commandJohnny Jazeix2020-04-134-2/+56
| | | | | | | | | | | | Fixes: #20563
* | | Merge topic 'cmake-gui-system-processor'Brad King2020-04-141-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 11cbf79d15 cmake-gui: Pass CMAKE_SYSTEM_PROCESSOR to from gui to cmake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4604
| * | | cmake-gui: Pass CMAKE_SYSTEM_PROCESSOR to from gui to cmakeJiri Malak2020-04-131-0/+3
| | | | | | | | | | | | | | | | | | | | Add missing `CMAKE_SYSTEM_PROCESSOR` cmake cache entry to passed options for first configure. We already pass `CMAKE_SYSTEM_{NAME,VERSION}`.
* | | | Merge topic 'clang-tidy-9.0-changes'Brad King2020-04-1429-135/+107
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7cb72fadc8 cmConfigureFileCommand: simplify no-op argument handling f413727d27 clang-tidy: address bugprone-sizeof-expression lint 609c3b7cdc cmComputeLinkInformation: reserve space in built-up string 89207abf1f cmParseCacheCoverage: use cmSystemTools::SplitString 59b7adddc4 nits: replace some "c" instances with 'c' 80edc2cd8a cmMakefile: use std::string_view 37872088cf clang-tidy: address readability-else-after-return lint f2a33107be clang-tidy: address bugprone-branch-clone lints ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4584
| * | | | cmConfigureFileCommand: simplify no-op argument handlingBen Boeckel2020-04-131-6/+20
| | | | |
| * | | | clang-tidy: address bugprone-sizeof-expression lintBen Boeckel2020-04-131-2/+4
| | | | |
| * | | | cmComputeLinkInformation: reserve space in built-up stringBen Boeckel2020-04-131-0/+1
| | | | | | | | | | | | | | | | | | | | This should avoid any reallocations that would occur in this function.
| * | | | cmParseCacheCoverage: use cmSystemTools::SplitStringBen Boeckel2020-04-132-29/+4
| | | | |
| * | | | nits: replace some "c" instances with 'c'Ben Boeckel2020-04-134-7/+7
| | | | |
| * | | | cmMakefile: use std::string_viewBen Boeckel2020-04-131-1/+2
| | | | |
| * | | | clang-tidy: address readability-else-after-return lintBen Boeckel2020-04-132-2/+4
| | | | |
| * | | | clang-tidy: address bugprone-branch-clone lintsBen Boeckel2020-04-1320-87/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Arguably, many of these are bugs in `clang-tidy`. An if/else tree with other conditionals between cloned blocks may be relying on the intermediate logic to fall out of the case and inverting this logic may be non-trivial. See: https://bugs.llvm.org/show_bug.cgi?id=44165
| * | | | clang-tidy: ignore making members staticBen Boeckel2020-04-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | CMake has lots of instances of this which is outside the scope of this topic right now.
| * | | | TestDriver: avoid clang-tidy lints in generated codeBen Boeckel2020-04-131-2/+5
| | | | |
| * | | | clang-tidy: ignore the use-trailing-return-type lintBen Boeckel2020-04-131-0/+1
| |/ / / | | | | | | | | | | | | CMake isn't ready for this yet.
* | | | Merge topic 'UseJava-quoting'Brad King2020-04-141-3/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01d5b888a3 UseJava: Quote -classpath argument correctly on more platforms Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Marc Chevrier <marc.chevrier@gmail.com> Merge-request: !4597
| * | | | UseJava: Quote -classpath argument correctly on more platformsBrad King2020-04-101-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the `VERBATIM` option to our `add_custom_command` calls so that all arguments are correctly escaped for the shell. Otherwise when using a POSIX shell on Windows, the `-classpath` separator is `;` and without quoting ends the command. Fixes: #20567 Inspired-by: Nevyn Bengtsson <nevyn.jpg@gmail.com>
* | | | | CMake Nightly Date StampKitware Robot2020-04-141-1/+1
| |/ / / |/| | |
* | | | Merge topic 'include-dir-special'Brad King2020-04-133-1/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9be48c4d0b Tests: Add coverage for special characters in include directories dc0dc974a9 Xcode: Fix quoting of paths with square brackets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4591
| * | | | Tests: Add coverage for special characters in include directoriesBrad King2020-04-102-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have tests for special characters in preprocessor definitions and custom command line arguments. Add such a test for include directories. Currently the Makefiles generators do not escape paths in `depend.make` in all cases, so leave a FIXME comment and skip the test for those. Issue: #20555
| * | | | Xcode: Fix quoting of paths with square bracketsBrad King2020-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Xcode project file format needs paths containing square brackets ('[' or ']') to be quoted. Issue: #20555
* | | | | Merge branch 'release-3.17'Brad King2020-04-130-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'FindMPI-pgi-spectrum-mpi-wrappers' into release-3.17Brad King2020-04-131-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd449c6175 FindMPI: Add the pgi compiler wrapper names used by IBM Spectrum MPI Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4598
* | \ \ \ \ \ Merge topic 'FindMPI-pgi-spectrum-mpi-wrappers'Brad King2020-04-131-3/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd449c6175 FindMPI: Add the pgi compiler wrapper names used by IBM Spectrum MPI Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4598
| * | | | | | FindMPI: Add the pgi compiler wrapper names used by IBM Spectrum MPIChuck Atkins2020-04-101-3/+3
| | | | | | |
* | | | | | | Merge branch 'release-3.17'Brad King2020-04-130-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'release-3.16' into release-3.17Brad King2020-04-130-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
* | | | | | | Merge topic 'update-kwsys'Brad King2020-04-136-107/+162
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0b495b6ca9 Merge branch 'upstream-KWSys' into update-kwsys 4ab6fcd676 KWSys 2020-04-10 (b62956f5) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4594
| * \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-04-106-107/+162
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-04-10 (b62956f5)
| | * | | | | | KWSys 2020-04-10 (b62956f5)KWSys Upstream2020-04-106-107/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit b62956f5d70fef750e8414342f1566a29e8e7899 (master). Upstream Shortlog ----------------- Ben Boeckel (6): ccab3808 clang-tidy: address readability-isolate-declaration lints 87b57076 clang-tidy: address readability-braces-around-statements lints 13b45a41 clang-tidy: address readability-else-after-return lints ebb48d58 clang-tidy: address google-readability-casting lint 09942f51 testSystemTools: add tests for SplitString 986519af SystemTools: handle splitting a string starting with the separator
* | | | | | | | Merge topic 'clang_cuda_prep'Brad King2020-04-139-192/+141
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d86fcc6359 CUDAToolkit: Deduce toolkit binary directory from compiler path only for NVCC 87e98bf8be CUDA: Forward CMAKE_CUDA_COMPILER_TARGET in try_compile() 60e60b9201 GNU: Disable depfiles in try-compile mode only for GCC 5f02add366 CUDA: Refactor PTX compilation flag into compiler modules 25439c7d62 Clang: Refactor CXX standard flags into __compiler_clang_cxx_standards() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4567
| * | | | | | | | CUDAToolkit: Deduce toolkit binary directory from compiler path only for NVCCRaul Tambre2020-04-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This assumption doesn't hold for Clang. When crosscompiling this causes X86 libraries to be used and thus linker errors.
| * | | | | | | | CUDA: Forward CMAKE_CUDA_COMPILER_TARGET in try_compile()Raul Tambre2020-04-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Required for crosscompile support with Clang.
| * | | | | | | | GNU: Disable depfiles in try-compile mode only for GCCRaul Tambre2020-04-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabling them causes issues for Clang's CUDA frontend. Since this is a GCC bug, simply check for GCC.
| * | | | | | | | CUDA: Refactor PTX compilation flag into compiler modulesRaul Tambre2020-04-072-1/+2
| | | | | | | | |
| * | | | | | | | Clang: Refactor CXX standard flags into __compiler_clang_cxx_standards()Raul Tambre2020-04-074-188/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These standard flags are the same for CXX, OBJCXX and CUDA. Refactor them into a single macro to reduce duplication and so we can easily reuse them. Updated bootstrap script to search in the general Clang module instead of the language-specific.
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-04-131-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'FindPython-help-updates'Marc Chevrier2020-04-123-24/+43
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 525c730afe Help: FindPython: fix typos and add some clarifications Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4599
| * | | | | | | | | Help: FindPython: fix typos and add some clarificationsMarc Chevrier2020-04-113-24/+43
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-04-121-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'release-3.17'Craig Scott2020-04-110-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'docs-CMAKE_CURRENT_FUNCTION' into release-3.17Craig Scott2020-04-115-25/+46
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10ee9611f0 Help: Improve wording of CMAKE_CURRENT_FUNCTION_LIST_DIR docs 22fbc404a7 Help: Add cross-references for CMAKE_CURRENT_FUNCTION* docs d2b139687a Help: Minor grammar cleanups of CMAKE_CURRENT_FUNCTION* docs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Acked-by: Alex Turbov <i.zaufi@gmail.com> Merge-request: !4595
* | \ \ \ \ \ \ \ \ \ Merge topic 'docs-CMAKE_CURRENT_FUNCTION'Craig Scott2020-04-115-25/+46
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10ee9611f0 Help: Improve wording of CMAKE_CURRENT_FUNCTION_LIST_DIR docs 22fbc404a7 Help: Add cross-references for CMAKE_CURRENT_FUNCTION* docs d2b139687a Help: Minor grammar cleanups of CMAKE_CURRENT_FUNCTION* docs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Acked-by: Alex Turbov <i.zaufi@gmail.com> Merge-request: !4595
| * | | | | | | | | | Help: Improve wording of CMAKE_CURRENT_FUNCTION_LIST_DIR docsCraig Scott2020-04-101-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original wording was somewhat confusing in talking about rendering of templates. While technically correct, a less experienced user may not know that terminology. The wording has been updated to more clearly describe the example usage. The old way of implementing the example is not "bad", it was the only way to do things before the CMAKE_CURRENT_FUNCTION_LIST_DIR variable was added. The example has been updated to remove the Bad/Good captions to reflect this. Indentation of the examples was also fixed to make them conform to the guidelines.
| * | | | | | | | | | Help: Add cross-references for CMAKE_CURRENT_FUNCTION* docsCraig Scott2020-04-103-0/+12
| | | | | | | | | | |
| * | | | | | | | | | Help: Minor grammar cleanups of CMAKE_CURRENT_FUNCTION* docsCraig Scott2020-04-105-5/+6
| | | | | | | | | | |