mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-03 04:03:23 +03:00
Code Activity
47,352 Commits 2 Branches 415 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph
47352 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Brad King 0e5a3ae7a9 Merge topic 'FindCURL-cmake-package' 
c11e7c5c3d FindCURL: Try to find CURLConfig.cmake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3903
 2019-10-16 09:51:32 -04:00
Tom Lankhorst a7ef28b9d8 Help: Fix typos and style in add_link_options documentation 2019-10-16 09:49:08 -04:00
Brad King 93b80638ce Merge topic 'CMakeFindBinUtils-cleanup' 
f0da223ff0 CMakeFindBinUtils: Remove unnecessary variable unset calls

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3920
 2019-10-16 09:45:59 -04:00
Brad King e0e109611a Merge topic 'swift-cross-compile' 
466ad466b4 try_compile: support Swift for cross-compilation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3921
 2019-10-16 09:45:11 -04:00
Brad King 4abdb1900a Merge topic 'FindCurses-tinfow' 
9fc87ef2e7 FindCurses: use tinfow when wide support is requested

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3915
 2019-10-16 09:44:08 -04:00
Brad King 2e133ca30b Merge topic 'FindHDF5-cray' 
08f4b5dcf9 FindHDF5: Append hdf5 to hdf5_hl to avoid undefined references
cd6f0ef35a FindHDF5: Cray HDF5 Fortran module filename is usually capitalized

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3918
 2019-10-16 09:43:12 -04:00
Kitware Robot 220d599507 CMake Nightly Date Stamp 2019-10-16 00:01:08 -04:00
Charles Barto c11e7c5c3d FindCURL: Try to find CURLConfig.cmake 2019-10-15 13:56:28 -04:00
Brad King 3658f4425a Merge branch 'swift-cross-compile' into release-3.16 
Merge-request: !3921
 2019-10-15 13:29:11 -04:00
Alexander Boczar 548e9051a4 VS: Add support to override VCTargetsPath through toolset 
Fixes: #19708
 2019-10-15 13:28:45 -04:00
Alexander Boczar 99e83d4235 cmake: Teach --build mode to load CMAKE_GENERATOR_TOOLSET 
Extend the `cmGlobalGenerator::SetGeneratorToolset` signature to
indicate when it is called from `cmake::build`.
 2019-10-15 13:28:41 -04:00
Saleem Abdulrasool 466ad466b4 try_compile: support Swift for cross-compilation 
Ensure that we preserve the `CMAKE_Swift_COMPILER_TARGET` variable to
use cross-compilation for testing the Swift compiler if appropriate.
 2019-10-15 13:25:14 -04:00
Charly Mourglia 89ff3ee779 VS: Add VS_DOTNET_DOCUMENTATION_FILE property 
Add a `VS_DOTNET_DOCUMENTATION_FILE` target property to tell VS
generators to add a `DocumentationFile` setting in `.csproj` files.

Fixes: #19784
 2019-10-15 11:44:55 -04:00
Butta c5892e484e Android: add support for native compilation, such as with the Termux app 
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
 2019-10-15 21:13:51 +05:30
Brad King 080163a657 Merge branch 'CMakeFindBinUtils-cleanup' into release-3.16 
Merge-request: !3920
 2019-10-15 11:19:53 -04:00
Brad King c3c751e9dd Merge branch 'FindCurses-tinfow' into release-3.16 
Merge-request: !3915
 2019-10-15 11:19:44 -04:00
Brad King c89794feae Merge branch 'FindHDF5-cray' into release-3.16 
Merge-request: !3918
 2019-10-15 11:19:31 -04:00
Brad King 6050951812 Merge branch 'release-3.16' 2019-10-15 11:18:51 -04:00
Brad King cdc8d75c49 Merge topic 'doc-static-lib-flags' 
fb16e0e7c0 Help: Clarify documentation of CMAKE_STATIC_LINKER_FLAGS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3919
 2019-10-15 11:17:03 -04:00
Brad King 4041f6a327 Merge branch 'doc-static-lib-flags' into release-3.16 
Merge-request: !3919
 2019-10-15 11:15:45 -04:00
Brad King dc164bccc1 Merge topic 'cmake-initial-cache-relative' 
c9d73b26b0 cmake: Fix relative path regression in -C

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3912
 2019-10-15 11:14:09 -04:00
Brad King e14518ec45 Merge topic 'FindOpenMP-clang-HIP-device' 
db5a8d7876 FindOpenMP: Add support for HIP clang device pass

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3911
 2019-10-15 11:13:10 -04:00
Brad King f0da223ff0 CMakeFindBinUtils: Remove unnecessary variable unset calls 
Some unset calls were added by commit 079b8e2916 (Clang: prefer lld-link
over link.exe, 2019-07-11, v3.16.0-rc1~161^2~2) but they are unnecessary
since commit 3a82ef78eb (CMakeFindBinUtils: Rename and unset variables
for additional names, 2019-07-23, v3.16.0-rc1~332^2~2).

Suggested-by: Norbert Lange <nolange79@gmail.com>
 2019-10-15 11:09:06 -04:00
Manuel Herrmann 9fc87ef2e7 FindCurses: use tinfow when wide support is requested 2019-10-15 09:50:52 -04:00