summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Unity Build: Add option for generating per-file unique idStephen Kelly2020-12-1513-3/+172
| | | | Fixes: #21477
* Merge topic 'FindMatlab-MCR'Brad King2020-12-141-32/+53
|\ | | | | | | | | | | | | | | 9c360b9eea FindMatlab: Fix search for MCR bda5e2ac8f FindMatlab: Only include engine and dataarray libraries if they are found Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5600
| * FindMatlab: Fix search for MCRNikolaj Fogh2020-12-111-29/+47
| | | | | | | | Fixes: #21068, #21582
| * FindMatlab: Only include engine and dataarray libraries if they are foundNikolaj Fogh2020-12-111-3/+6
| |
* | Merge topic 'custom-command-output-genex'Brad King2020-12-1430-179/+614
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1127-107/+367
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Help: Add examples to add_custom_command reference documentationBrad King2020-12-101-0/+38
| | |
* | | Merge topic 'doc-try_compile-typos'Brad King2020-12-143-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1f41eb8472 Help: Fix small typos in documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5609
| * | | Help: Fix small typos in documentationGuillem Vela2020-12-143-3/+3
| | | |
* | | | 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 'update-curl'Brad King2020-12-14328-3684/+4813
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d0bac89cea curl: Set build options the way we need for CMake 54931fdff0 Merge branch 'upstream-curl' into update-curl 5aacc593a9 curl 2020-12-09 (e0528597) 4cd65e5d88 curl: Update script to get curl 7.74.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5592
| * | | | curl: Set build options the way we need for CMakeBrad King2020-12-111-1/+3
| | | | |
| * | | | Merge branch 'upstream-curl' into update-curlBrad King2020-12-09327-3682/+4809
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2020-12-09 (e0528597)
| | * | | | curl 2020-12-09 (e0528597)Curl Upstream2020-12-09327-3684/+4809
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit e052859759b34d0e05ce0f17244873e5cd7b457b (curl-7_74_0).
| * | | | | curl: Update script to get curl 7.74.0Brad King2020-12-091-1/+1
| | | | | |
* | | | | | Merge branch 'release-3.19'Brad King2020-12-140-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge topic 'FindGLUT-macos-tbd' into release-3.19Brad King2020-12-141-2/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d29d034e2e FindGLUT: Handle Mojave and Big Sur 'tbd' framework files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5601
* | \ \ \ \ \ \ Merge topic 'FindGLUT-macos-tbd'Brad King2020-12-141-2/+10
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d29d034e2e FindGLUT: Handle Mojave and Big Sur 'tbd' framework files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5601
| * | | | | | | FindGLUT: Handle Mojave and Big Sur 'tbd' framework filesRobert Maynard2020-12-111-2/+10
| | | | | | | |
* | | | | | | | Merge branch 'release-3.19'Brad King2020-12-140-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'macos-homebrew-apple-silicon' into release-3.19Brad King2020-12-141-0/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a5c1a68b6 macOS: Add /opt/homebrew to CMAKE_SYSTEM_PREFIX_PATH on Apple Silicon Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Fons Rademakers <fons.rademakers@cern.ch> Merge-request: !5602
* | \ \ \ \ \ \ \ Merge topic 'macos-homebrew-apple-silicon'Brad King2020-12-141-0/+7
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1a5c1a68b6 macOS: Add /opt/homebrew to CMAKE_SYSTEM_PREFIX_PATH on Apple Silicon Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Fons Rademakers <fons.rademakers@cern.ch> Merge-request: !5602
| * | | | | | | | macOS: Add /opt/homebrew to CMAKE_SYSTEM_PREFIX_PATH on Apple SiliconBrad King2020-12-111-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to https://brew.sh/2020/12/01/homebrew-2.6.0/ the `/opt/homebrew` directory is recommended for installing ARM architecture brew packages. Fixes: #21585
* | | | | | | | | Merge branch 'release-3.19'Brad King2020-12-140-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'install-properties' into release-3.19Brad King2020-12-141-0/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63db7ae9c4 cmake: Clear INSTALL file properties between runs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5603
* | \ \ \ \ \ \ \ \ 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 branch 'release-3.19'Brad King2020-12-140-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'execute_process-command-error' into release-3.19Brad King2020-12-1422-42/+217
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5a4ffaad1 execute_process: Improve COMMAND_ERROR_IS_FATAL error capture scenarios Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5588
* | | | | | | | | Merge topic 'execute_process-command-error'Brad King2020-12-1422-42/+217
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1022-42/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | 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
| | | | | | | |
* | | | | | | | Merge branch 'release-3.19'Brad King2020-12-110-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge topic 'apple-silicon-host-arch' into release-3.19Brad King2020-12-1122-16/+245
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7f0327dcd Tests: Cover macOS host architecture selection on Apple Silicon hosts 5f882f6ce5 macOS: Offer control over host architecture on Apple Silicon hosts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5589
* | \ \ \ \ \ \ \ Merge topic 'apple-silicon-host-arch'Brad King2020-12-1122-16/+245
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7f0327dcd Tests: Cover macOS host architecture selection on Apple Silicon hosts 5f882f6ce5 macOS: Offer control over host architecture on Apple Silicon hosts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5589
| * | | | | | | | Tests: Cover macOS host architecture selection on Apple Silicon hostsBrad King2020-12-1014-0/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add test cases verifying that `CMAKE_APPLE_SILICON_PROCESSOR` set as either a cache or environment variable causes that to be selected as the host architecture. Also verify that sources compile using whatever is selected as the host architecture, even when the explicit setting is not used. Issue: #21554
generated by cgit v0.12 at 2025-01-23 01:28:14 (GMT)