mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-08 15:19:51 -05:00
Code Issues Packages Projects Releases Wiki Activity
45,475 Commits 2 Branches 401 Tags
0bf7a93f91de33bee151fc36c373a9f64f5db6c2
Commit Graph

45475 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 0bf7a93f91 Merge topic 'ccmake-clear-help' 
9276beae5e ccmake: Fully clear the 1st help line when processing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3937
 2019-10-21 11:29:12 -04:00
Brad King 667f2861dc Merge topic 'project-include-before' 
f7acc1266c project: Add variable CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE_BEFORE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3936
 2019-10-21 11:24:28 -04:00
Brad King 53f95dc5fb Merge topic 'export-compile-commands-environment-variable' 
8065a686dd Initialize CMAKE_EXPORT_COMPILE_COMMANDS from envvar of the same name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3914
 2019-10-21 11:23:47 -04:00
Brad King 8347c75d1e Merge branch 'release-3.16' 2019-10-21 11:21:50 -04:00
Brad King 7b89ae8d7b Merge branch 'release-3.15' 2019-10-21 11:21:43 -04:00
Brad King ede1bebd50 Merge topic 'FindOpenMP-include-dir' 
409891baf7 FindOpenMP: Allow try_compile() to find omp.h for AppleClang

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3916
 2019-10-21 11:20:33 -04:00
Brad King 61c6d49f5a Merge topic 'doc-genex-tweak' 
c684db4ea8 Help: Fix COMPILE_LANG_AND_ID genex example

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3939
 2019-10-21 11:19:45 -04:00
Brad King 50afd147f8 Merge topic 'vs-per-config-sources' 
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
 2019-10-21 11:12:06 -04:00
Brad King eaebd4fc47 Merge branch 'FindOpenMP-include-dir' into release-3.16 
Merge-request: !3916
 2019-10-21 11:09:56 -04:00
Brad King 308990b2bc Merge branch 'doc-genex-tweak' into release-3.16 
Merge-request: !3939
 2019-10-21 10:27:21 -04:00
Brad King 08173075c1 Merge branch 'doc-genex-tweak' into release-3.15 
Merge-request: !3939
 2019-10-21 10:26:48 -04:00
Alan W. Irwin c684db4ea8 Help: Fix COMPILE_LANG_AND_ID genex example 
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
 2019-10-21 10:25:41 -04:00
Kitware Robot a82a96f35b CMake Nightly Date Stamp 2019-10-21 00:01:05 -04:00
Sylvain Joubert 9276beae5e ccmake: Fully clear the 1st help line when processing 2019-10-20 14:25:05 +02:00
Kitware Robot 41854d608b CMake Nightly Date Stamp 2019-10-20 00:01:04 -04:00
Kitware Robot 0671f71d70 CMake Nightly Date Stamp 2019-10-19 00:01:07 -04:00
Deniz Bahadir f7acc1266c project: Add variable CMAKE_PROJECT_<PROJECT-NAME>_INCLUDE_BEFORE 
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
 2019-10-18 14:44:24 -04:00
Daan De Meyer 8065a686dd Initialize CMAKE_EXPORT_COMPILE_COMMANDS from envvar of the same name 
Fixes: #18386
 2019-10-18 14:37:33 -04:00
Brad King 493c4e781a Merge branch 'release-3.16' 2019-10-18 10:36:40 -04:00
Brad King 92780281c2 CMake 3.16.0-rc2 v3.16.0-rc2 2019-10-18 09:23:00 -04:00
Brad King fdb41a5102 Merge topic 'variable_watch-modernize' 
4bedf6c9fa Refactor: Modernize `cmVariableWatchCommand` a little

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3892
 2019-10-18 09:02:29 -04:00
Brad King b34b4c5eac Merge topic 'vs-vctargetspath' 
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
 2019-10-18 09:01:48 -04:00
Brad King c867981c9d Merge branch 'release-3.16' 2019-10-18 08:58:01 -04:00
Brad King 1c84b5c86f Merge topic 'pch-makefile-depends' 
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
 2019-10-18 08:57:16 -04:00
Kitware Robot 154aa87ca6 CMake Nightly Date Stamp 2019-10-18 00:01:07 -04:00
Brad King 55a0bebdd3 VS: Add support for per-config sources 
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
 2019-10-17 14:05:39 -04:00
Brad King bcaecf6bcd Teach check for single-language targets to consider all configurations 2019-10-17 14:03:54 -04:00
Brad King 324988a6b1 cmGeneratorTarget: Add GetAllConfigCompileLanguages method 
Return all languages needed to compile sources in the target in
any configuration.
 2019-10-17 14:03:54 -04:00
Brad King fd2c9fac10 cmGeneratorTarget: Return non-const sources from GetAllConfigSources 
We need a non-const pointer to `cmSourceFile` instances in order to
call `GetOrDetermineLanguage` on them.
 2019-10-17 14:03:54 -04:00
Brad King f6dac38c11 Merge branch 'release-3.16' 2019-10-17 13:55:23 -04:00
Brad King 5417737fac Merge topic 'graphviz' 
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
 2019-10-17 13:54:26 -04:00
Brad King d61b8921ac Merge topic 'doc-pch-compile-language' 
ac75886525 PCH: Document and test COMPILE_LANGUAGE genex for per-language header

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3925
 2019-10-17 13:52:49 -04:00
Brad King ea048ed66c Merge topic 'export-target-lang-name' 
0e436c573c install,export: Do not treat language names as target names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3927
 2019-10-17 13:52:00 -04:00
Brad King b903092b31 Merge topic 'vs_dotnet_documentation_file' 
89ff3ee779 VS: Add VS_DOTNET_DOCUMENTATION_FILE property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3879
 2019-10-17 13:51:11 -04:00
Brad King 6dedb97420 Merge branch 'pch-makefile-depends' into release-3.16 
Merge-request: !3928
 2019-10-17 10:41:43 -04:00
Brad King 797689ab35 PCH: Fix Makefile dependencies to rebuild PCH on header changes 
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
 2019-10-17 10:29:31 -04:00
Brad King 7aab792716 Merge branch 'export-target-lang-name' into release-3.16 
Merge-request: !3927
 2019-10-17 10:23:36 -04:00
Alexander Boczar e7d57bc3c3 VS: Propagate CMAKE_VS_GLOBALS into custom targets 
Issue: #19708
 2019-10-17 10:19:01 -04:00
Alexander Boczar 45b4b4b930 VS: Propagate CMAKE_VS_GLOBALS into compiler id projects 
Issue: #19708
 2019-10-17 10:18:52 -04:00
Alex Turbov 4bedf6c9fa Refactor: Modernize cmVariableWatchCommand a little 2019-10-17 09:38:31 -04:00
Craig Scott 409891baf7 FindOpenMP: Allow try_compile() to find omp.h for AppleClang 
Fixes: #18098 #18470 #18520
 2019-10-17 18:50:05 +11:00
Kitware Robot 095fc6d9d9 CMake Nightly Date Stamp 2019-10-17 00:01:09 -04:00
Brad King 0b10b3ed6b cmMakefileTargetGenerator: Inline WriteObjectBuildFile in only call site 2019-10-16 13:48:14 -04:00
Brad King 0e436c573c install,export: Do not treat language names as target names 
When generating `IMPORTED_LINK_INTERFACE_LANGUAGES`, do not treat the
entries as target names.

Fixes: #19846
 2019-10-16 12:48:20 -04:00
Brad King 84e14a52ff Merge branch 'doc-pch-compile-language' into release-3.16 
Merge-request: !3925
 2019-10-16 10:54:11 -04:00
Brad King ac75886525 PCH: Document and test COMPILE_LANGUAGE genex for per-language header 
Fixes: #19839
 2019-10-16 10:32:56 -04:00
Brad King e60412b63e Merge branch 'release-3.16' 2019-10-16 10:24:00 -04:00
Brad King 4116d5104e Merge topic 'doc-add_link_options-typos' 
a7ef28b9d8 Help: Fix typos and style in add_link_options documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3922
 2019-10-16 10:23:22 -04:00
Brad King c2a7729177 Merge branch 'doc-add_link_options-typos' into release-3.16 
Merge-request: !3922
 2019-10-16 09:53:39 -04:00
Brad King 96a93a7f64 Merge branch 'release-3.16' 2019-10-16 09:53:14 -04:00