summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-04-211-1/+8
|\ | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-04-21 (44086372)
| * KWSys 2020-04-21 (44086372)KWSys Upstream2020-04-211-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 4408637212fe1ddf09425beba97e105009734e31 (master). Upstream Shortlog ----------------- Hernan Martinez (1): 00629420 SystemInformation: Add support for Windows on ARM64
* | CMake Nightly Date StampKitware Robot2020-04-211-1/+1
| |
* | Merge topic 'device-link'Brad King2020-04-20125-211/+985
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4248bb452a CUDA: Device linking use now link options ec48e023f6 CUDA: Add information for LINKER: pattern translation 3fdae5acaa Genex: Add generator expressions $<DEVICE_LINK> and $<HOST_LINK> 38332fc4fa cmGeneratorExpressionDAGChecker: introduce method Top() Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4577
| * | CUDA: Device linking use now link optionsMarc Chevrier2020-04-1933-152/+370
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properties LINK_OPTIONS and INTERFACE_LINK_OPTIONS are propagated to the device link step. To control which options are selected for normal link and device link steps, the $<DEVICE_LINK> and $<HOST_LINK> generator expressions can be used. Fixes: #18265
| * | CUDA: Add information for LINKER: pattern translationMarc Chevrier2020-04-192-0/+18
| | |
| * | Genex: Add generator expressions $<DEVICE_LINK> and $<HOST_LINK>Marc Chevrier2020-04-1994-11/+572
| | | | | | | | | | | | | | | | | | These generator expressions can only be used in link options properties. These expressions return the arguments respectively for device and host link step, otherwise return an empty string.
| * | cmGeneratorExpressionDAGChecker: introduce method Top()Marc Chevrier2020-04-182-48/+25
| | |
* | | Merge topic 'FindPkgConfig-frameworks'Brad King2020-04-207-88/+98
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95ead38375 FindPkgConfig: fix handling of frameworks b7304f35b3 Tests: simplify FindPkgConfig_CMAKE_{FRAMEWORK,APPBUNDLE}_PATH tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3814
| * | | FindPkgConfig: fix handling of frameworksRolf Eike Beer2020-04-185-0/+90
| | | |
| * | | Tests: simplify FindPkgConfig_CMAKE_{FRAMEWORK,APPBUNDLE}_PATH testsRolf Eike Beer2020-04-182-88/+8
| | | | | | | | | | | | | | | | | | | | These tests are only run on Apple platforms, so remove code for all other platforms form them.
* | | | Merge topic 'update-kwsys'Brad King2020-04-202-7/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b6ce851bef Merge branch 'upstream-KWSys' into update-kwsys 363ec4f585 KWSys 2020-04-17 (54845345) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4621
| * \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-04-172-7/+4
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-04-17 (54845345)
| | * | | KWSys 2020-04-17 (54845345)KWSys Upstream2020-04-172-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 5484534580e49723f2d5ba094697880deabf9f48 (master). Upstream Shortlog ----------------- Ben Boeckel (1): 39fd4817 testProcess: fix another clang-tidy warning Brad King (1): b8177b56 testProcess: Disable unreliable test case 7
* | | | | Merge branch 'release-3.17'Brad King2020-04-200-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'ninja-fortran-doc' into release-3.17Brad King2020-04-202-13/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa31c195b8 Ninja: Document that Fortran support is available with Ninja 1.10+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4626
* | \ \ \ \ \ Merge topic 'ninja-fortran-doc'Brad King2020-04-202-13/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2fa7d20b2 Merge branch 'backport-3.17-ninja-fortran-doc' into ninja-fortran-doc fa31c195b8 Ninja: Document that Fortran support is available with Ninja 1.10+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4626
| * \ \ \ \ \ \ Merge branch 'backport-3.17-ninja-fortran-doc' into ninja-fortran-docBrad King2020-04-172-13/+2
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Ninja: Document that Fortran support is available with Ninja 1.10+Brad King2020-04-172-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ninja 1.10 was released in Jan 2020 and has the features we need to support Fortran. Replace documentation that mentions Kitware's branch with mention of Ninja 1.10+ instead.
* | | | | | | | CMake Nightly Date StampKitware Robot2020-04-201-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'ctest-memcheck-sanitizers'Craig Scott2020-04-199-14/+39
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e03d3c08f0 CTest: Fix '-T MemCheck' command-line support for sanitizers 82b6091776 Tests: Fix RunCMake.ctest_memcheck test script syntax errors Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4618
| * | | | | | | | CTest: Fix '-T MemCheck' command-line support for sanitizersBrad King2020-04-173-8/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 49948f7221 (ctest_memcheck: Add support for ThreadSanitizer, 2014-07-07, v3.1.0-rc1~322^2~1) and commit 1e005eadbc (CTest: Fix MemoryCheckType from 'ctest -T MemCheck', 2014-07-15, v3.1.0-rc1~298^2), the `CMakeCommand` internal setting was left set only when using `ctest -S` scripts. Instead simply use CTest's corresponding CMake directly without passing it through an internal setting. Fixes: #20584
| * | | | | | | | Tests: Fix RunCMake.ctest_memcheck test script syntax errorsBrad King2020-04-166-6/+6
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-04-191-1/+1
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | Merge topic 'findpython-fix-indentation'Marc Chevrier2020-04-181-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62b51845db FindPython: fix some indentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4623
| * | | | | | | FindPython: fix some indentationBen Boeckel2020-04-171-2/+2
| | | | | | | |
* | | | | | | | Merge topic 'add-contains-to-cmext-algorithm'Marc Chevrier2020-04-1839-186/+259
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aacd4e4a90 Refactoring: add cm::contains to <cmext/algorithm> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4606
| * | | | | | | | Refactoring: add cm::contains to <cmext/algorithm>Marc Chevrier2020-04-1739-186/+259
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-04-181-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge topic 'update-gitsetup'Brad King2020-04-170-0/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51581a4b4b Merge branch 'upstream-GitSetup' into update-gitsetup 58696abdfe GitSetup 2020-04-17 (b162f746) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4624
| * \ \ \ \ \ \ Merge branch 'upstream-GitSetup' into update-gitsetupBrad King2020-04-170-0/+0
| |\ \ \ \ \ \ \ |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By GitSetup Upstream * upstream-GitSetup: GitSetup 2020-04-17 (b162f746)
| * | | | | | | GitSetup 2020-04-17 (b162f746)GitSetup Upstream2020-04-171-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/gitsetup.git at commit b162f7465b8163be49ba6d0ea9400f418c2fbb9d (setup).
* | | | | | | | Merge topic 'setup-user-portable'Brad King2020-04-171-1/+8
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 22aff63653 setup-user: restore portability Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4612
| * | | | | | | setup-user: restore portabilityJiri Malak2020-04-151-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes in commit 5129e97285 (setup-user: switch to git-var to check if username and e-mail are set, 2019-11-24, v3.17.0-rc1~379^2) now require the `rev` and `cut` tools to be available. Revise the logic to use that approach only when they are available, and otherwise fall back to the previous more portable approach. Co-Author: Brad King <brad.king@kitware.com>
* | | | | | | | Merge topic 'doc-set_property-append-empty'Brad King2020-04-171-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ad937fb36c Help: Document that set_property APPEND ignores empty values Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4622
| * | | | | | | | Help: Document that set_property APPEND ignores empty valuesBrad King2020-04-171-1/+2
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes: #20581
* | | | | | | | Merge branch 'release-3.17'Brad King2020-04-170-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge topic 'ios_multi_arch_fix' into release-3.17Brad King2020-04-171-11/+76
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 170e598add iOS: Fix detection of supported SDK architectures Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alexander Köplinger <alex.koeplinger@outlook.com> Merge-request: !4615
* | \ \ \ \ \ \ \ Merge topic 'ios_multi_arch_fix'Brad King2020-04-171-11/+76
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 170e598add iOS: Fix detection of supported SDK architectures Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Alexander Köplinger <alex.koeplinger@outlook.com> Merge-request: !4615
| * | | | | | | | iOS: Fix detection of supported SDK architecturesAlexandru Croitor2020-04-161-11/+76
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of relying on SDKSettings.plist which does not contain the certain architectures, deduce the supported architectures by inspecting libSystem.tbd and libSystem.dylib. .tbd files are text files, so just parse out the archs string. .dylib files can be fat or non-fat, so use lipo -info to extract the architectures and parse lipo output. Fixes: #20588
* | | | | | | | Merge topic 'FindPython-dev-subcomponents'Brad King2020-04-1713-113/+452
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c1b4044d3e FindPython: add sub-components to Development component Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4616
| * | | | | | | FindPython: add sub-components to Development componentMarc Chevrier2020-04-1613-113/+452
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20425
* | | | | | | | CMake Nightly Date StampKitware Robot2020-04-171-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'cat_cmd_20557'Kyle Edwards2020-04-1613-0/+92
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a625f30785 cmake -E: add cat command. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4600
| * | | | | | | | cmake -E: add cat command.Johnny Jazeix2020-04-1513-0/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Concatenate files and print on the standard output. FIXES: #20557
* | | | | | | | | Merge topic 'cuda_architectures'Brad King2020-04-1648-36/+318
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 21131ca60c CUDA: Add CudaOnly.CompileFlags test f0931b0790 CUDA: Convert tests to use CUDA_ARCHITECTURES e98588aaba CUDA: Add CUDA_ARCHITECTURES target property Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Patrick Stotko <stotko@cs.uni-bonn.de> Merge-request: !4568
| * | | | | | | | | CUDA: Add CudaOnly.CompileFlags testRaul Tambre2020-04-153-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Covers passing compile flags explicitly for both NVCC and Clang.
| * | | | | | | | | CUDA: Convert tests to use CUDA_ARCHITECTURESRaul Tambre2020-04-1516-35/+16
| | | | | | | | | |
| * | | | | | | | | CUDA: Add CUDA_ARCHITECTURES target propertyRaul Tambre2020-04-1530-1/+269
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplifies CUDA target architecture handling. Required for Clang support as Clang doesn't automatically select a supported architecture. We detect a supported architecture during compiler identification and set CMAKE_CUDA_ARCHITECTURES to it. Introduces CMP0104 for backwards compatibility with manually setting code generation flags with NVCC. Implements #17963.
* | | | | | | | | | Merge topic 'makefile-target-special'Brad King2020-04-1618-77/+177
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a4173ef165 Tests: Enable coverage of special chars in include dirs for Makefiles d74e651b78 Makefiles: Re-implement makefile target path escaping and quoting 031bfaa865 Makefiles: Factor out makefile target path escaping and quoting ca343dad07 Makefiles: Convert paths with '#' on command-lines to short path on Windows af7de05853 Makefiles: Do not use '\#' escape sequence with Windows-style make tools 1639ee70ef cmDepends: Update types to always use a Makefile generator 413d26030f cmGlobalNinjaGenerator: Remove outdated comment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4605
generated by cgit v0.12 at 2025-01-17 03:44:30 (GMT)