summaryrefslogtreecommitdiffstats
path: root/Tests/RunCMake/NinjaMultiConfig
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge topic 'ninja-multi-default-config-fix' into release-3.17Brad King2020-02-072-0/+5
|\ | | | | | | | | | | | | 1844be451e Ninja Multi-Config: Fix issue with CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4331
| * Ninja Multi-Config: Fix issue with CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIGKyle Edwards2020-02-062-0/+5
| | | | | | | | | | | | Fix an issue where CMAKE_NMC_DEFAULT_BUILD_FILE_CONFIG is specified and CMAKE_NMC_CROSS_CONFIGS is not, which results in a false error with CMAKE_NMC_DEFAULT_CONFIGS.
* | Ninja Multi-Config: Don't include MinSizeRel by defaultKyle Edwards2020-02-061-4/+4
|/
* Ninja Multi-Config: Use build.ninja if cmake --build has no --configKyle Edwards2020-02-042-2/+8
| | | | | | If cmake --build is called with no --config argument, and a build.ninja file is available, use that instead of defaulting to the Debug config.
* Merge topic 'ninja-multi-variable-shuffle'Brad King2020-02-0321-10/+230
|\ | | | | | | | | | | | | b966f86d86 Ninja Multi-Config: Shuffle variables around Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4305
| * Ninja Multi-Config: Shuffle variables aroundKyle Edwards2020-02-0321-10/+230
| | | | | | | | | | | | Remove redundant variable CMAKE_NINJA_MULTI_CROSS_CONFIG_ENABLE. Rename other variables. Document and improve handling of error conditions.
* | NinjaMultiConfig: CUDA executables generate symbols on windowsRobert Maynard2020-01-312-0/+6
| |
* | Merge topic 'automoc-using-depfiles'Brad King2020-01-301-0/+12
|\ \ | |/ |/| | | | | | | | | | | | | | | aebfbcaa46 AutoGen: Use depfiles for the XXX_autogen ninja targets f765fdea03 AutoGen: Use moc's feature to output dependencies f8c505d4b3 Add a parser for GCC-style depfiles Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Jan Niklas Hasse <jhasse@bixense.com> Merge-request: !4221
| * AutoGen: Use depfiles for the XXX_autogen ninja targetsJoerg Bornemann2020-01-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The XXX_autogen targets are implemented as utility commands, which means they always run, even if there weren't any changes. For the Ninja generator and Qt >= 5.15 we're taking a different approach: This commit adds custom commands that create XXX_autogen/timestamp files. Those custom commands have a depfile assigned that is generated from the depfiles that were created by moc. The XXX_autogen targets merely wrap the XXX_autogen/timestamp custom commands. Fixes: #18749
| * AutoGen: Use moc's feature to output dependenciesJoerg Bornemann2020-01-281-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Qt version 5.15.0 moc learned to output the dependencies of the generated file. This commit enhances JobCompileMocT to read the dependency file written by moc. The dependencies are stored in the same cache that's used for the dependencies determined by dependency filters. The dependency filter functionality is turned off if moc's dependency output feature is used. Fixes: #17750 Fixes: #19058
* | Ninja Multi-Config: Fix bug with MacOS frameworksKyle Edwards2020-01-242-0/+29
|/
* Ninja Multi-Config: Add variable to control configs used in cross-config buildKyle Edwards2020-01-2315-0/+377
|
* Ninja Multi-Config: Add variable to control aliases in build.ninjaKyle Edwards2020-01-225-0/+140
|
* Refactor: Split Ninja files into impl-<Config>.ninja and build-<Config>.ninjaKyle Edwards2020-01-224-0/+142
|
* Ninja Multi-Config: Rename variable to be more consistentKyle Edwards2020-01-161-7/+7
| | | | Also make some tweaks to the documentation.
* Merge topic 'ninja_multi_config_support_cuda'Kyle Edwards2020-01-146-0/+101
|\ | | | | | | | | | | | | c7ac13e8ed CUDA: Mult-Config Ninja generator now supports CUDA Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4187
| * CUDA: Mult-Config Ninja generator now supports CUDARobert Maynard2020-01-136-0/+101
| |
* | Ninja Multi-Config: Improve error handling when not doing cross-config buildKyle Edwards2020-01-132-6/+2
|/
* Ninja Multi-Config: Make cross-config building opt-inKyle Edwards2020-01-1016-5/+106
| | | | | | | | | | | Many users will want to use the Ninja Multi-Config generator like a traditional Visual Studio-style multi-config generator, which doesn't mix configurations - custom commands are built using target executables of the same configuration the command is for. We do not want to force these people to generate an N*N build matrix when they only need N*1, especially if they have lots of targets. Add a new variable, CMAKE_NINJA_CROSS_CONFIG_ENABLE, to opt-in to the cross-config build matrix.
* Tests: Add test for Multi-Configuration Ninja generatorKyle Edwards2019-12-1371-0/+1703