summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* cmLocalGenerator: Adopt custom target 'force' output name generationBrad King2020-12-154-32/+27
|
* cmLocalGenerator: Refactor custom command generator constructionBrad King2020-12-155-85/+113
| | | | | | | Add support for constructing and using multiple generators for one custom command. cmGeneratorTarget contains a code path that needs this behavior when used with Ninja but not other generators, so use virtual dispatch through cmLocalGenerator.
* cmMakefile: Simplify custom target 'force' output name generationBrad King2020-12-155-32/+16
| | | | | | | | | | | | | | | Remove unnecessary check of policy CMP0049. The policy can never trigger on our internally-generated name because it has no variable references. The rename in commit 0ed5ce4cd8 (cmTarget: Rename AddSource method for backward compatibility., 2014-03-17, v3.1.0-rc1~688^2~17) made it look like this code path depended on CMP0049. Then commit 0e1faa28cb (cmMakefile: Separate custom command setup from actual creation, 2019-09-14, v3.16.0-rc1~85^2) and commit ea1bed34b2 (cmMakefile: Extract utilities used for creation of custom commands, 2019-09-21, v3.16.0-rc1~52^2~1) built additional infrastructure to thread that dependence through the call stack. Remove it all.
* Merge topic 'custom-command-output-genex'Brad King2020-12-149-141/+241
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c257c25419 add_custom_{command,target}: Add genex support to OUTPUT and BYPRODUCTS f36af9228b cmLocalGenerator: Evaluate generator expressions in custom command outputs c887cefd9a cmLocalGenerator: Simplify custom command output cmSourceFile creation 947ba01bf9 cmLocalGenerator: Factor out helper to expand custom command output paths 1902d28ebc cmLocalGenerator: Refactor UpdateOutputToSourceMap to avoid boolean trap e4034eabe9 cmLocalGenerator: Re-order logic in CreateGeneratedSource 706c48301d cmCustomCommandGenerator: Treat relative outputs w.r.t. build dir 5d23c5446e cmCustomCommandGenerator: Refactor OUTPUT and DEPENDS path evaluation ... Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Acked-by: Pavel Solodovnikov <hellyeahdominate@gmail.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5402
| * add_custom_{command,target}: Add genex support to OUTPUT and BYPRODUCTSBrad King2020-12-116-69/+32
| | | | | | | | | | | | | | | | | | Move rejection of `#`, `<`, and `>` characters in outputs and byproducts to a generate-time check. This removes the front-end check that disallowed generator expressions. The generators have already been updated to handle them. Fixes: #12877
| * cmLocalGenerator: Evaluate generator expressions in custom command outputsBrad King2020-12-112-4/+101
| | | | | | | | | | | | | | | | | | | | | | Custom commands with generator expressions in their OUTPUTs or BYPRODUCTS are still attached to a single `.rule` file. We use an internal map to look up the source file holding the custom command for a given output. Populate this map using the outputs and byproducts from all configurations after evaluating the generator expressions for each configuration. Issue: #12877
| * cmLocalGenerator: Simplify custom command output cmSourceFile creationBrad King2020-12-102-43/+39
| | | | | | | | | | Move calls to `CreateGeneratedSource` over to `UpdateOutputToSourceMap`, which is called for all generated outputs and byproducts.
| * cmLocalGenerator: Factor out helper to expand custom command output pathsBrad King2020-12-103-5/+15
| |
| * cmLocalGenerator: Refactor UpdateOutputToSourceMap to avoid boolean trapBrad King2020-12-102-12/+17
| |
| * cmLocalGenerator: Re-order logic in CreateGeneratedSourceBrad King2020-12-101-8/+9
| | | | | | | | Return early on errors to reduce nesting.
| * cmCustomCommandGenerator: Treat relative outputs w.r.t. build dirBrad King2020-12-101-11/+28
| | | | | | | | | | | | The `add_custom_command` and `add_custom_target` commands already do this for plain output and byproduct paths. Perform the same conversion for such paths discovered after generator expression evaluation too.
| * cmCustomCommandGenerator: Refactor OUTPUT and DEPENDS path evaluationBrad King2020-12-101-17/+20
| | | | | | | | | | | | * Use value semantics. * Normalize paths in a separate loop. * If CollapseFullPath is used, ConvertToUnixSlashes is unnecessary.
| * cmCustomCommandGenerator: Evaluate generator expressions in outputsBrad King2020-12-102-1/+3
| | | | | | | | | | | | | | | | | | | | This was already done for byproducts by commit a583b7bc17 (Genex: Evaluate byproduct generator expressions in cmCustomCommandGenerator, 2019-09-11, v3.16.0-rc1~86^2). Like that commit, this does not actually expose the feature to projects because the front-end commands still reject generator expressions. Issue: #12877
| * cmAddCustom{Command,Target}Command: Skip conversions on genex pathsBrad King2020-12-102-3/+9
| | | | | | | | | | | | | | | | | | | | | | If an output or byproduct path starts in a generator expression, do not convert it to a full path yet. That will have to be done at generate time after evaluating the generator expressions. Also update the `add_custom_target` byproduct path conversion added by commit 445ff5ccdf (Byproducts: collapse full paths of custom target byproducts, 2019-09-11, v3.16.0-rc1~103^2~1) to match the behavior of `add_custom_command` when a path starts in a generator expression.
* | Merge topic 'makefiles-compiler-deps-optims'Brad King2020-12-141-79/+14
|\ \ | | | | | | | | | | | | | | | | | | b2ff3c52df cmDependsCompiler: rely now on cmGccDepfileReader for depfile parser Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5599
| * | cmDependsCompiler: rely now on cmGccDepfileReader for depfile parserMarc Chevrier2020-12-111-79/+14
| | | | | | | | | | | | | | | | | | To avoid duplicate effort of depfile parsing and enhance robustness of parsing against mal-formed depfiles in preparation of DEPFILE option support of add_custom_command command for makefiles generators.
* | | Merge topic 'automoc-autouic-autorcc-not-csharp'Brad King2020-12-141-0/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f65f20938c Autogen: Avoid processing CSharp targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5507
| * | | Autogen: Avoid processing CSharp targetsAlessandro Ambrosano2020-12-111-0/+7
| |/ / | | | | | | | | | Fixes: #21442
* | | Merge topic 'install-properties'Brad King2020-12-141-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 63db7ae9c4 cmake: Clear INSTALL file properties between runs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5603
| * | | cmake: Clear INSTALL file properties between runsBrad King2020-12-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not keep state across separate project configurations. This is particularly important in `cmake-gui` where those configurations can be for separate projects. Fixes: #21580
* | | | Merge topic 'execute_process-command-error'Brad King2020-12-141-31/+87
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5a4ffaad1 execute_process: Improve COMMAND_ERROR_IS_FATAL error capture scenarios Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5588
| * | | | execute_process: Improve COMMAND_ERROR_IS_FATAL error capture scenariosAsit Dhal2020-12-101-31/+87
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. COMMAND_ERROR_IS_FATAL ANY will capture errors if the exit code is non zero, there is a timeout or an abnormal exit. 2. COMMAND_ERROR_IS_FATAL LAST will capture if only the last process has an exit code non zero, there is a timeout or an abnormal exit. Fixes: #21562
| * | | Merge topic 'correct_ispc_path_computation' into release-3.19Brad King2020-12-083-14/+31
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9af93fef11 ISPC: Handle OBJECT sources in different directories 72ae15ebcb ISPC: Ninja properly compute ISPC_HEADER_DIRECTORY location Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5581
* | | | | CMake Nightly Date StampKitware Robot2020-12-141-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2020-12-131-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2020-12-121-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2020-12-111-1/+1
| |_|/ |/| |
* | | Merge topic 'cpp23'Brad King2020-12-102-7/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f3c70a333 CUDA, CXX, OBJCXX: C++23 support with Clang 12 af7e1545c8 CUDA, CXX: Remove HAS_FULL_SUPPORT for C++17 and 20 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5576
| * | | CUDA, CXX, OBJCXX: C++23 support with Clang 12Raul Tambre2020-12-082-7/+9
| | | | | | | | | | | | | | | | | | | | Clang 12 landed initial support for C++23 language mode flag -std={c|gnu}++2b in commit 6627a3c2873fdf7ccba1a1573371079be48b36e8.
* | | | CMake Nightly Date StampKitware Robot2020-12-101-1/+1
| | | |
* | | | Merge topic 'xcode-ios-empty-sticker-pack'Brad King2020-12-091-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0a60d1b6b4 Allow empty source file list for iOS Sticker packs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5587
| * | | | Allow empty source file list for iOS Sticker packsAndrew Shaitorov2020-12-061-0/+8
| | | | |
* | | | | Merge topic 'cmp0116-automoc'Brad King2020-12-092-6/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1080935732 AutoGen: Account for CMP0116 in the depfile 287c591079 cmake -E: Fix cmake_transform_depfile escaping of transformed paths Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !5584
| * | | | | AutoGen: Account for CMP0116 in the depfileKyle Edwards2020-12-081-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21467
| * | | | | cmake -E: Fix cmake_transform_depfile escaping of transformed pathsBrad King2020-12-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit b2c14bc774 (cmake -E: Add cmake_transform_depfile internal command, 2020-10-02) we forgot to use `WriteFilenameGcc` in one place.
* | | | | | CMake Nightly Date StampKitware Robot2020-12-091-1/+1
| | | | | |
* | | | | | Merge topic 'range-for-avoid-tmp-warning'Brad King2020-12-081-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99a26babb1 Cleanup: Fix warning about binding to a temporary in range-based for Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5578
| * | | | | | Cleanup: Fix warning about binding to a temporary in range-based forCraig Scott2020-12-071-1/+4
| | | | | | |
* | | | | | | Merge topic 'correct_ispc_path_computation'Brad King2020-12-083-14/+31
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | / | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 9af93fef11 ISPC: Handle OBJECT sources in different directories 72ae15ebcb ISPC: Ninja properly compute ISPC_HEADER_DIRECTORY location Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5581
| * | | | | ISPC: Handle OBJECT sources in different directoriesRobert Maynard2020-12-072-8/+22
| | | | | |
| * | | | | ISPC: Ninja properly compute ISPC_HEADER_DIRECTORY locationRobert Maynard2020-12-071-6/+9
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2020-12-081-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'get_dir_prop_arg_parsing'Brad King2020-12-071-18/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab1ee5aab8 get_directory_property: Check for empty or missing property name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5577
| * | | | | get_directory_property: Check for empty or missing property nameCraig Scott2020-12-051-18/+25
| | |/ / / | |/| | | | | | | | Fixes: #21555
* | | | | Merge topic 'asm_arch'Brad King2020-12-071-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | fcabf4a47e macOS: Add architecture flags only for native ASM dialect Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5572
| * | | | macOS: Add architecture flags only for native ASM dialectRaul Tambre2020-12-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ASM dialects like NASM have languages names such as ASM_NASM. However such ASM dialects don't support the architecture flags, so match only the full name. Fixes #21553.
| * | | | Merge topic 'export-namelink' into release-3.19Brad King2020-12-024-8/+19
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 38bcb5c0a3 export: Do not fail generation for separate namelink only case Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5556
| * \ \ \ \ Merge topic 'ninja-regen-metadata' into release-3.19Brad King2020-12-012-2/+11
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73d1c78bf4 ci: update to use ninja 1.10.2 11f4259362 Ninja: Clean metadata after regen during build on Windows with 1.10.2+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5555
* | | | | | | CMake Nightly Date StampKitware Robot2020-12-071-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2020-12-061-1/+1
| |_|_|/ / |/| | | |