summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2020-04-171-1/+1
|
* Merge topic 'cat_cmd_20557'Kyle Edwards2020-04-161-0/+35
|\ | | | | | | | | | | | | a625f30785 cmake -E: add cat command. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4600
| * cmake -E: add cat command.Johnny Jazeix2020-04-151-0/+35
| | | | | | | | | | | | Concatenate files and print on the standard output. FIXES: #20557
* | Merge topic 'cuda_architectures'Brad King2020-04-166-1/+103
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 CUDA_ARCHITECTURES target propertyRaul Tambre2020-04-156-1/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1614-63/+143
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | 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-154-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | | CMake Nightly Date StampKitware Robot2020-04-161-1/+1
| | | |
* | | | Merge topic 'cpack-nsis-dpi-aware'Brad King2020-04-151-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-141-0/+5
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 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 '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 'ibmi-aix-exports'Brad King2020-04-151-2/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 420e91c951 AIX: Activate symbol export/import IBM i (OS400) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4611
| * | | | | AIX: Activate symbol export/import IBM i (OS400)Brad King2020-04-141-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20582
| * | | | | CMake 3.16.6v3.16.6Brad King2020-04-101-1/+1
| | | | | |
| * | | | | Merge branch 'backport-3.16-link-libs-config-case' into release-3.16Brad King2020-03-301-5/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !4544
| | * | | | | target_link_libraries: Fix regression in case of $<CONFIG> genexBrad King2020-03-301-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit b8626261e9 (Precompile headers: Add methods to generate PCH sources, 2019-07-13, v3.16.0-rc1~182^2~4) we look up source files for a target using an upper-case configuration even though an original-case name is sufficient. Since commit 36ded610af (PCH: Generate sources during Compute step, 2019-10-05, v3.16.0-rc1~2^2) the source file lookup is the first time we compute many on-demand structures that depend on the configuration name. This caused the `$<CONFIG>` generator expression to evaluate to the upper-case configuration name in some cases where we used original-case before. Fix this by switching the source file lookup to the original-case config name. Add a test covering the symptom that led to the discovery of this problem. Fixes: #20517
| * | | | | | Merge branch 'make-nested-silent' into release-3.16Brad King2020-03-261-1/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4515
* | | | | | | | CMake Nightly Date StampKitware Robot2020-04-151-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge topic 'sort_list_natural_20563'Brad King2020-04-141-2/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-131-2/+21
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | 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-1425-131/+96
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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
* | | | | | | CMake Nightly Date StampKitware Robot2020-04-141-1/+1
|/ / / / / /
* | | | | | Merge topic 'include-dir-special'Brad King2020-04-131-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | 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 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)
* | | | | | | Merge topic 'clang_cuda_prep'Brad King2020-04-131-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | CUDA: Forward CMAKE_CUDA_COMPILER_TARGET in try_compile()Raul Tambre2020-04-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Required for crosscompile support with Clang.
* | | | | | | | CMake Nightly Date StampKitware Robot2020-04-131-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-04-121-1/+1
| | | | | | | |