summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.17'Brad King2020-02-250-0/+0
|\
| * Merge topic 'FindCUDA-no-threads-target' into release-3.17Brad King2020-02-251-1/+5
| |\ | | | | | | | | | | | | | | | | | | b9d67447c3 FindCUDA: Only depend on Threads::Threads on platforms that need it Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4377
* | \ Merge topic 'FindCUDA-no-threads-target'Brad King2020-02-251-1/+5
|\ \ \ | | |/ | |/| | | | | | | | | | | | | b9d67447c3 FindCUDA: Only depend on Threads::Threads on platforms that need it Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4377
| * | FindCUDA: Only depend on Threads::Threads on platforms that need itRobert Maynard2020-02-241-1/+5
| | | | | | | | | | | | | | | | | | | | | In commit 46371132b3 (FindCUDA: CUDA_LIBRARIES doesn't contain raw `-pthread`, 2019-11-11, v3.17.0-rc1~455^2) we introduced use of the `Threads::Threads` target, but we do not `find_package(Threads)` on all platforms. Use the target only if it exists.
* | | Merge branch 'release-3.16'Brad King2020-02-250-0/+0
|\ \ \
| * \ \ Merge branch 'FindPkgConfig-scope' into release-3.16Brad King2020-02-241-0/+6
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !4388
| * \ \ \ Merge branch 'backport-cuda-non-device-link' into release-3.16Brad King2020-02-242-3/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !4376
* | \ \ \ \ Merge branch 'release-3.15'Brad King2020-02-250-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'backport-cuda-non-device-link' into release-3.15Brad King2020-02-242-3/+3
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | Merge-request: !4376
* | | | | | | Merge branch 'release-3.17'Brad King2020-02-250-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge topic 'FindPkgConfig-scope' into release-3.17Brad King2020-02-251-0/+6
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c3e0d1ffe9 FindPkgConfig: set policies CMP0054 and CMP0057 to new Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4388
* | | | | | | Merge topic 'FindPkgConfig-scope'Brad King2020-02-251-0/+6
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c3e0d1ffe9 FindPkgConfig: set policies CMP0054 and CMP0057 to new Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4388
| * | | | | | FindPkgConfig: set policies CMP0054 and CMP0057 to newRolf Eike Beer2020-02-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One may encounter warnings if FindPkgConfig is used in any project, even indirectly, that has set any of these policies to old explicitely or requires an older version.
* | | | | | | Merge branch 'release-3.17'Brad King2020-02-250-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'cuda-non-device-link' into release-3.17Brad King2020-02-252-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7da2c8c543 Merge branch 'backport-cuda-non-device-link' 738f3f23aa Ninja: Do not use nvcc response files with non-nvcc tools Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4376
* | \ \ \ \ \ \ Merge topic 'cuda-non-device-link'Brad King2020-02-252-3/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7da2c8c543 Merge branch 'backport-cuda-non-device-link' 738f3f23aa Ninja: Do not use nvcc response files with non-nvcc tools Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4376
| * | | | | | | Merge branch 'backport-cuda-non-device-link'Brad King2020-02-242-3/+3
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | / | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Ninja: Do not use nvcc response files with non-nvcc toolsFrancisco Facioni2020-02-242-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit d91b5a72cd (Ninja: Add support for CUDA nvcc response files, 2019-05-30, v3.15.0-rc1~8^2) we use NVCC's `--options-file` option to avoid long link command lines via a response file. However, for non-device linking the host tools are used and the option does not make sense. Update the logic to use `--options-file` only for device linking. Linking with the host tools already has its own logic for response files. Fixes: #19954
* | | | | | | CMake Nightly Date StampKitware Robot2020-02-251-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.17'Brad King2020-02-240-0/+0
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge topic 'pch-create-via-include' into release-3.17Brad King2020-02-243-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c6d6ec27c PCH: Clang: Update PCH usage flags to include original header Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4360
* | \ \ \ \ \ \ Merge topic 'pch-create-via-include'Brad King2020-02-243-3/+3
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c6d6ec27c PCH: Clang: Update PCH usage flags to include original header Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4360
| * | | | | | | PCH: Clang: Update PCH usage flags to include original headerSergey Larin2020-02-243-3/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an additional include flag to PCH usage command line to fix programs that rely on `compile_commands.json` file. Pass it to the preprocessor directly to avoid compiler driver to change it to '-include-pch'. When preprocessor is requested to preprocess a file, it tries to get the original filename from '.pch' and uses that file for preprocessing. CMake generates a '.pch' file from the '.hxx' file by passing an empty '.cxx' source file to the compiler as a compilation unit and the header file with the '-include' flag. After that, compiler puts compilation unit filename in the '.pch' as the original filename. However, CMake build system uses empty file as the source file and passes the header file using '-include-pch' flag. As a result, Clang uses the wrong file for preprocessing and produces the corrupted preprocessed file. Fixes: #20355 Signed-off-by: Sergey Larin <cerg2010cerg2010@mail.ru>
* | | | | | | Merge topic 'ctest-resource-allocation-doc'Craig Scott2020-02-241-0/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d966634b60 Help: Clarify that the CTest resource allocation feature doesn't oversubscribe Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4382
| * | | | | | | Help: Clarify that the CTest resource allocation feature doesn't oversubscribeKyle Edwards2020-02-211-0/+9
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-02-241-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-02-231-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-02-221-1/+1
|/ / / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2020-02-211-1/+1
| | | | | | |
* | | | | | | Merge topic 'string-hex'Kyle Edwards2020-02-2012-1/+77
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 97b639d3f1 Help: Make note that file(READ ... HEX) produces lowercase letters 5395bf05eb string: Add new HEX sub-command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4373
| * | | | | | | Help: Make note that file(READ ... HEX) produces lowercase lettersKyle Edwards2020-02-191-1/+3
| | | | | | | |
| * | | | | | | string: Add new HEX sub-commandKyle Edwards2020-02-1911-0/+74
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-02-201-1/+1
|/ / / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2020-02-191-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.17'Brad King2020-02-180-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'update-kwsys' into release-3.17Brad King2020-02-182-6/+18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce59cabc70 KWSys: SystemTools: CopyFileIfDifferent: Fix endless recursion Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4361
* | \ \ \ \ \ \ Merge topic 'update-kwsys'Brad King2020-02-183-7/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f9111be36 Merge branch 'backport-kwsys-copy-fix' into update-kwsys ce59cabc70 KWSys: SystemTools: CopyFileIfDifferent: Fix endless recursion fc6eced05e Merge branch 'upstream-KWSys' into update-kwsys 96dd383ceb KWSys 2020-02-17 (3e117fe1) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4361
| * \ \ \ \ \ \ \ Merge branch 'backport-kwsys-copy-fix' into update-kwsysBrad King2020-02-180-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | KWSys: SystemTools: CopyFileIfDifferent: Fix endless recursionBrad King2020-02-182-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport KWSys commit `ea77593a1` (SystemTools: CopyFileIfDifferent: Fix endless recursion, 2020-02-13) for the CMake 3.17 branch. Fixes: #20347
| * | | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-02-173-7/+19
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-02-17 (3e117fe1)
| | * | | | | | | | KWSys 2020-02-17 (3e117fe1)KWSys Upstream2020-02-173-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 3e117fe1e008aeca4a4f33a431b196848cc34e11 (master). Upstream Shortlog ----------------- Brad King (1): c2420a42 SystemTools: Revert "CopyFileIfDifferent: Ensure that source is a file" Julien Schueller (1): c3acc96d CMake: Fix psapi lib name on case-sensitive fs Sebastian Lipponer (2): 573713fa SystemTools: CopyFileIfDifferent: Ensure that source is a file ea77593a SystemTools: CopyFileIfDifferent: Fix endless recursion
* | | | | | | | | | Merge topic 'doc-sections'Brad King2020-02-185-82/+116
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 22aac6669b Help: install: use bullet lists to sort out target kinds b3f4d50348 Help: ifw.rst: Add toc; mv "Hints" section -> subsection of "Variables" c671966c20 Help: CPackComponent: Sectioning and rewording 05e56b1897 Help: FetchContent, ExternalProject: Command sections -> subsections Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4367
| * | | | | | | | | | Help: install: use bullet lists to sort out target kindsJoachim Wuttke (o)2020-02-171-17/+24
| | | | | | | | | | |
| * | | | | | | | | | Help: ifw.rst: Add toc; mv "Hints" section -> subsection of "Variables"Joachim Wuttke (o)2020-02-171-26/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also explain `@ApplicationsDir@`, thanks to https://discourse.cmake.org/t/647/2 for help.
| * | | | | | | | | | Help: CPackComponent: Sectioning and rewordingJoachim Wuttke (o)2020-02-171-34/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Insert section and subsection headers (because this is a very long doc page) * In the Introduction, first say that module is included automatically * Then start with operational definition of components * Remove duplications * Also reword the description of the command cpack_add_component
| * | | | | | | | | | Help: FetchContent, ExternalProject: Command sections -> subsectionsJoachim Wuttke (o)2020-02-172-5/+11
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'doc-string'Brad King2020-02-181-4/+6
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 466b138ea2 Help: string: regex match and replace is a subcase of Search&Replace Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4368
| * | | | | | | | | | | Help: string: regex match and replace is a subcase of Search&ReplaceJoachim Wuttke (o)2020-02-171-4/+6
| |/ / / / / / / / / /
* | | | | | | | | | | Merge topic 'deprecate-policy-old'Brad King2020-02-183-1/+19
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c78ae16d81 Add deprecation warnings for policies CMP0071 and below Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4369
| * | | | | | | | | | | Add deprecation warnings for policies CMP0071 and belowBrad King2020-02-173-1/+19
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OLD behaviors of all policies are deprecated, but only by documentation. Add an explicit deprecation diagnostic for policies introduced in CMake 3.10 and below to encourage projects to port away from setting policies to OLD.