summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | | | | Tests: Enable coverage of special chars in include dirs for MakefilesBrad King2020-04-153-13/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #20555
| * | | | | | | | Makefiles: Re-implement makefile target path escaping and quotingBrad King2020-04-151-5/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we used `cmSystemTools::ConvertToOutputPath` which internally used KWSys methods * SystemTools::ConvertToUnixOutputPath * SystemTools::ConvertToWindowsOutputPath These were written in very early days of CMake and have some limitations: * They do not encode all characters. E.g. '#' is left out. * They attempt to do some path cleanup and handle existing quotes. These days CMake has clean unquoted paths already. * They attempted to encode paths both for makefile targets and for shell command lines. The latter use has mostly been replaced. * Choosing between the two methods depends on a global variable! Several code paths in CMake have to copy the global generator's member ForceUnixPaths variable over to the cmSystemTools global. Re-implement the `ConvertToMakefilePath` method to drop use of those methods. Compute suitable makefile target path escaping and quoting via local logic. Add support for more characters like '#'. Fixes: #20555
| * | | | | | | | Makefiles: Factor out makefile target path escaping and quotingBrad King2020-04-155-41/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code paths that write makefile target paths use a combination of `cmSystemTools::ConvertToOutputPath` and `cmMakeSafe`. Some were missing the latter. Wrap these two steps up into a dedicated `ConvertToMakefilePath` method provided on both the local and global generators.
| * | | | | | | | Makefiles: Convert paths with '#' on command-lines to short path on WindowsBrad King2020-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In `ConvertToOutputForExisting` we convert paths with spaces to short paths on Windows for use on command lines, e.g. for include directories. Do the same for paths with `#` since tools like NMake do not have a way to reliably put `#` in variable assignments.
| * | | | | | | | Makefiles: Do not use '\#' escape sequence with Windows-style make toolsBrad King2020-04-155-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit fbf7a92975 (Makefile: Handle '#' in COMPILE_OPTIONS, 2014-08-12, v3.1.0-rc1~174^2) we escape `#` as `\#` in `flags.make` variable assignments so that they are not treated as a comment. Windows-style make tools like NMake do not interpret backslashes in that way. Other means will be needed to handle `#` in contexts where it is even possible. The test suite is not covering this for NMake anyway, and actually has a workaround in `Tests/TryCompile` for the old behavior, which we can now update.
| * | | | | | | | cmDepends: Update types to always use a Makefile generatorBrad King2020-04-136-15/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only use these classes with a `cmLocalUnixMakefileGenerator3`. Construct using that type instead of just `cmLocalGenerator` so that the Makefile-specific methods are available.
| * | | | | | | | cmGlobalNinjaGenerator: Remove outdated commentBrad King2020-04-131-2/+0
| | | | | | | | |
* | | | | | | | | Merge topic 'update-kwsys'Brad King2020-04-163-11/+16
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87a06afce3 Merge branch 'upstream-KWSys' into update-kwsys 1b37136633 KWSys 2020-04-15 (5ada375f) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4614
| * | | | | | | | 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-161-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge topic 'support_pseudo_sysroots'Brad King2020-04-1512-0/+75
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8cc384f629 Compilers: Add paths from -print-sysroot to system prefix path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4585
| * | | | | | | | | | Compilers: Add paths from -print-sysroot to system prefix pathRobert Maynard2020-04-1412-0/+75
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'cpack-nsis-dpi-aware'Brad King2020-04-156-0/+25
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d6840a4f3c CPack/NSIS: Add option for setting DPI-aware Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4607
| * | | | | | | | | | | CPack/NSIS: Add option for setting DPI-awareJohnny Jazeix2020-04-146-0/+25
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://nsis.sourceforge.io/Reference/ManifestDPIAware for more information. Fixes: #17724
* | | | | | | | | | | Merge topic 'cmprop-source'Brad King2020-04-1518-183/+197
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e64fa5f1b6 cmSourceFile::GetProperty: return cmProp fc223f9860 cmGlobalXCodeGenerator: Fix genex interpreter overloads Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4603
| * | | | | | | | | | | cmSourceFile::GetProperty: return cmPropVitaly Stakhovsky2020-04-1418-181/+191
| | | | | | | | | | | |
| * | | | | | | | | | | cmGlobalXCodeGenerator: Fix genex interpreter overloadsBrad King2020-04-141-2/+6
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overload both signatures to add Xcode-specific functionality. Co-Author: Vitaly Stakhovsky <vvs31415@gitlab.org>
* | | | | | | | | | | Merge topic 'doc-CMAKE_PREFIX_PATH-env-var'Brad King2020-04-153-9/+33
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d59c6ea5c6 Help: Convert find_package references to CMAKE_PREFIX_PATH to links 03b6f3a2e8 Help: Document the CMAKE_PREFIX_PATH environment variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4609
| * | | | | | | | | | | Help: Convert find_package references to CMAKE_PREFIX_PATH to linksBrad King2020-04-141-9/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Help: Document the CMAKE_PREFIX_PATH environment variableJean-Michaël Celerier2020-04-142-0/+24
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'msbuildUtf8Support'Brad King2020-04-1516-71/+127
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bc877a7e94 Add support to indicate UTF-8 custom command pipe output encoding Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4587
| * | | | | | | | | | | | Add support to indicate UTF-8 custom command pipe output encodingJustin Goshi2020-04-1316-71/+127
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a flag to indicate that pipe output from a custom command should be interpreted as UTF-8 encoded. This change does not introduce a public way to set the flag, but generators that create internally-generated commands know if they are calling cmake, which uses UTF-8 pipes. MSBuild added support for interpreting output of PreBuildEvent, PreLinkEvent, PostBuildEvent, and CustomBuildStep as UTF-8. This change will appear in Visual Studio 16.6 Preview 3. It is opt-in, and you need to add the StdOutEncoding tag. MSBuild treats these as property bags so if we emit the tag for earlier versions of Visual Studio it would be safely ignored. This change emits the StdOutEncoding tag and sets it to UTF-8 whenever the custom command UTF-8 pipe flag is set. This fixes globalization issues when the output from cmake contained characters that required MSBuild to interpret as UTF-8 before displaying them.
* | | | | | | | | | | | Merge topic 'CMakePrintSystemInformation-processor'Brad King2020-04-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 06e2c54115 CMakePrintSystemInformation: Add CMAKE_SYSTEM_PROCESSOR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4608
generated by cgit v0.12 at 2025-01-10 16:31:27 (GMT)