summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fortran: Add .F extension to Source Files groupJohnny Jazeix2019-10-231-3/+2
| | | | | | While at it, improve source layout of the regex string literal. Fixes: #8768
* CMake Nightly Date StampKitware Robot2019-10-231-1/+1
|
* Merge topic 'android-native'Brad King2019-10-227-1/+40
|\ | | | | | | | | | | | | c5892e484e Android: add support for native compilation, such as with the Termux app Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3917
| * Android: add support for native compilation, such as with the Termux appButta2019-10-157-1/+40
| | | | | | | | | | | | | | | | | | The CMake support for Android assumes cross-compilation using the NDK, so stub out that Android NDK support and use the Linux support that's already invoked. Set CMAKE_HOST_SYSTEM_NAME to "Android", rather than "Linux". Issue: #19840
* | CMake Nightly Date StampKitware Robot2019-10-221-1/+1
| |
* | Merge branch 'release-3.16'Brad King2019-10-210-0/+0
|\ \
| * \ Merge branch 'ccmake-clear-help' into release-3.16Brad King2019-10-211-1/+1
| |\ \ | | | | | | | | | | | | Merge-request: !3937
* | \ \ Merge topic 'ccmake-clear-help'Brad King2019-10-211-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 9276beae5e ccmake: Fully clear the 1st help line when processing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3937
| * | | ccmake: Fully clear the 1st help line when processingSylvain Joubert2019-10-201-1/+1
| | | |
* | | | Merge topic 'project-include-before'Brad King2019-10-2110-5/+48
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7acc1266c project: Add variable CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE_BEFORE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3936
| * | | | project: Add variable CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE_BEFOREDeniz Bahadir2019-10-1810-5/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up commit 0761186949 (project: Add variable CMAKE_PROJECT_INCLUDE_BEFORE, 2019-03-28, v3.15.0-rc1~294^2) with a project-specific variant. This variable will be used similar to the already existing `CMAKE_PROJECT_INCLUDE_BEFORE` and `CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE` variables. Fixes: #19854
* | | | | Merge topic 'export-compile-commands-environment-variable'Brad King2019-10-2111-4/+58
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8065a686dd Initialize CMAKE_EXPORT_COMPILE_COMMANDS from envvar of the same name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3914
| * | | | | Initialize CMAKE_EXPORT_COMPILE_COMMANDS from envvar of the same nameDaan De Meyer2019-10-1811-4/+58
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18386
* | | | | | Merge branch 'release-3.16'Brad King2019-10-210-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'FindOpenMP-include-dir' into release-3.16Brad King2019-10-212-1/+43
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3916
| * \ \ \ \ \ Merge branch 'doc-genex-tweak' into release-3.16Brad King2019-10-211-1/+1
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | Merge-request: !3939
* | | | | | | Merge branch 'release-3.15'Brad King2019-10-210-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'doc-genex-tweak' into release-3.15Brad King2019-10-211-1/+1
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | Merge-request: !3939
* | | | | | | | Merge topic 'FindOpenMP-include-dir'Brad King2019-10-212-1/+43
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 409891baf7 FindOpenMP: Allow try_compile() to find omp.h for AppleClang Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3916
| * | | | | | | FindOpenMP: Allow try_compile() to find omp.h for AppleClangCraig Scott2019-10-172-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18098 #18470 #18520
* | | | | | | | Merge topic 'doc-genex-tweak'Brad King2019-10-211-1/+1
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c684db4ea8 Help: Fix COMPILE_LANG_AND_ID genex example Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3939
| * | | | | | | Help: Fix COMPILE_LANG_AND_ID genex exampleAlan W. Irwin2019-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the `COMPILE_LANGUAGE/CXX_COMPILER_ID` variant of the example to have the same meaning as the `COMPILE_LANG_AND_ID` variant. The inconsistency was introduced by commit 808b818063 (Genex: CompileLang and CompileLangAndId now match against a list of ids, 2019-05-30, v3.15.0-rc1~11^2~1). Fixes: #19862
* | | | | | | | Merge topic 'vs-per-config-sources'Brad King2019-10-217-18/+33
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 55a0bebdd3 VS: Add support for per-config sources bcaecf6bcd Teach check for single-language targets to consider all configurations 324988a6b1 cmGeneratorTarget: Add GetAllConfigCompileLanguages method fd2c9fac10 cmGeneratorTarget: Return non-const sources from GetAllConfigSources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3882
| * | | | | | | | VS: Add support for per-config sourcesBrad King2019-10-174-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 97cc29c766 (VS: Teach generators how to mark per-config source files, 2017-04-10, v3.9.0-rc1~268^2~2) the VS generators have known how to generate per-config sources. We've now converted most other code paths to support per-config sources, so drop the check that disallows it. This leaves only per-config support for precompiled headers and unity build transformations, but those are optional features that can be addressed later. Fixes: #18233 Issue: #19789
| * | | | | | | | Teach check for single-language targets to consider all configurationsBrad King2019-10-172-4/+2
| | | | | | | | |
| * | | | | | | | cmGeneratorTarget: Add GetAllConfigCompileLanguages methodBrad King2019-10-172-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return all languages needed to compile sources in the target in any configuration.
| * | | | | | | | cmGeneratorTarget: Return non-const sources from GetAllConfigSourcesBrad King2019-10-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need a non-const pointer to `cmSourceFile` instances in order to call `GetOrDetermineLanguage` on them.
* | | | | | | | | CMake Nightly Date StampKitware Robot2019-10-211-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2019-10-201-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2019-10-191-1/+1
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge branch 'release-3.16'Brad King2019-10-180-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | CMake 3.16.0-rc2v3.16.0-rc2Brad King2019-10-181-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'variable_watch-modernize'Brad King2019-10-189-61/+58
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4bedf6c9fa Refactor: Modernize `cmVariableWatchCommand` a little Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3892
| * | | | | | | | Refactor: Modernize `cmVariableWatchCommand` a littleAlex Turbov2019-10-179-61/+58
| | | | | | | | |
* | | | | | | | | Merge topic 'vs-vctargetspath'Brad King2019-10-1823-51/+203
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7d57bc3c3 VS: Propagate CMAKE_VS_GLOBALS into custom targets 45b4b4b930 VS: Propagate CMAKE_VS_GLOBALS into compiler id projects 548e9051a4 VS: Add support to override VCTargetsPath through toolset 99e83d4235 cmake: Teach --build mode to load CMAKE_GENERATOR_TOOLSET Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3817
| * | | | | | | | | VS: Propagate CMAKE_VS_GLOBALS into custom targetsAlexander Boczar2019-10-172-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #19708
| * | | | | | | | | VS: Propagate CMAKE_VS_GLOBALS into compiler id projectsAlexander Boczar2019-10-175-39/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #19708
| * | | | | | | | | VS: Add support to override VCTargetsPath through toolsetAlexander Boczar2019-10-1513-1/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19708
| * | | | | | | | | cmake: Teach --build mode to load CMAKE_GENERATOR_TOOLSETAlexander Boczar2019-10-159-9/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the `cmGlobalGenerator::SetGeneratorToolset` signature to indicate when it is called from `cmake::build`.
* | | | | | | | | | Merge branch 'release-3.16'Brad King2019-10-180-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'pch-makefile-depends' into release-3.16Brad King2019-10-176-27/+38
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3928
* | \ \ \ \ \ \ \ \ \ Merge topic 'pch-makefile-depends'Brad King2019-10-186-27/+38
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | / / | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 797689ab35 PCH: Fix Makefile dependencies to rebuild PCH on header changes 0b10b3ed6b cmMakefileTargetGenerator: Inline WriteObjectBuildFile in only call site Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3928
| * | | | | | | | | PCH: Fix Makefile dependencies to rebuild PCH on header changesBrad King2019-10-175-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the Makefile generator to scan the implicit dependencies of PCH creation. When a header named by `target_precompile_headers` changes the corresponding PCH must be rebuilt and all consumers recompiled. Fixes: #19830
| * | | | | | | | | cmMakefileTargetGenerator: Inline WriteObjectBuildFile in only call siteBrad King2019-10-162-22/+4
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2019-10-181-1/+1
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge branch 'release-3.16'Brad King2019-10-170-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch 'export-target-lang-name' into release-3.16Brad King2019-10-173-14/+30
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3927
| * \ \ \ \ \ \ \ Merge branch 'doc-pch-compile-language' into release-3.16Brad King2019-10-163-1/+22
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3925
* | \ \ \ \ \ \ \ \ Merge topic 'graphviz'Brad King2019-10-1750-501/+1692
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 553658393c Graphviz: added test suite, fixes, enhancements Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: slodki <slodki_dom@poczta.onet.pl> Merge-request: !3766
| * | | | | | | | | | Graphviz: added test suite, fixes, enhancementsCorentin Plouet2019-10-0850-501/+1692
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added a fairly comprehensive test suite * Separated the graph traversal logic from the Graphviz generation code by introducing a new class, cmLinkItemsGraphVisitor{.h,cxx} * Made the graph traversal logic less ad-hoc by using existing methods in the GlobalGenerator; this fixed a few bugs * Added support for new target types: custom targets, object and unknown libraries * Improved support for ALIAS libraries by showing the alias(es) in the graph * Introduced new flags to control those new libraries (consistent with existing flags) * Updated the documentation * Removed useless setting to set graph type in dot file * Improved the node/edge shapes (nicer, more consistent) * Added a legend to the graph * Some refactoring and cleanup of the Graphviz generation code * Added test and fix for issue 19746