mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-26 18:58:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
46,498 Commits 2 Branches 391 Tags
110037369d9be6c346f3de5074bb2e4d47c7e36c
Commit Graph

46498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kyle Edwards
110037369d Refactor: Split Ninja files into impl-<Config>.ninja and build-<Config>.ninja 2020-01-22 10:26:21 -05:00
Kyle Edwards
e62a3414f7 Refactor: Move common.ninja into CMakeFiles 2020-01-22 10:25:35 -05:00
Kyle Edwards
593d0f3a57 Merge topic 'ninja-restat-just-build.ninja' 
eb2da206d9 cmGlobalNinjaGenerator: only restat build.ninja

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4245
 2020-01-22 10:25:06 -05:00
Brad King
15c573df41 Merge topic 'mark_as_advanced-without-cache' 
3ec82b713e cmMarkAsAdvancedCommand: ignore variables which don't exist in the cache
701a5c60e0 cmake: avoid marking local or unused variables as advanced
af158149e7 FindOpenSSL: do not mark a local variable as advanced
74f659f1f2 FindCurses: only mark CURSES_EXTRA_LIBRARY when it is used
7e2ae4e96d FindOpenGL: only mark declared cache variables as advanced
7cc02a0c29 FindLua: only mark LUA_MATH_LIBRARY as advanced if required
85cd26b8a6 FindBoost: only mark Boost_DIR as advanced if defined
338c7916ba CTest: avoid marking undeclared cache variables as advanced
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4150
 2020-01-22 09:50:49 -05:00
Brad King
39695f6fb3 Merge topic 'modernize-memory-management' 
edab5add57 cmMakefileTargetGenerator: modernize memory management

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4250
 2020-01-22 09:49:30 -05:00
Brad King
fad5716c2a Merge topic 'test-file-download' 
65a3c68259 Tests: Make CMake.FileDownload invalid host name case more robust

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4252
 2020-01-22 09:48:40 -05:00
Brad King
3be2abd889 Merge topic 'install-std-string' 
5e54b0cf2f cmInstallGenerator: std::string params

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4255
 2020-01-22 09:40:32 -05:00
Brad King
fbd20759be Merge topic 'FindMPI-fix-return' 
8217a26d29 FindMPI: Fix regression when compiling with MPI wrappers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4254
 2020-01-22 09:30:53 -05:00
Brad King
3f601ebb0a Merge topic 'vs-std-string' 
2e768924f3 cmLocalVisualStudio7Generator: clean up c_str()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4249
 2020-01-22 09:24:57 -05:00
Brad King
352545666e Merge branch 'release-3.15' 2020-01-22 09:22:58 -05:00
Brad King
a723ba489c Merge branch 'release-3.16' 2020-01-22 09:17:42 -05:00
Brad King
2bca519eca Merge topic 'msvc-runtime-library-masm' 
1421005835 ASM_MASM: Populate MSVC runtime library abstraction table

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4257
 2020-01-22 09:17:41 -05:00
Brad King
39c357b9c4 Merge topic 'msvc-runtime-library-masm' into release-3.16 
1421005835 ASM_MASM: Populate MSVC runtime library abstraction table

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4257
 2020-01-22 09:17:41 -05:00
Kitware Robot
0877438599 CMake Nightly Date Stamp 2020-01-22 00:01:07 -05:00
Brad King
99e1be5d43 Merge branch 'msvc-runtime-library-masm' into release-3.15 
Merge-request: !4257
 2020-01-21 12:55:36 -05:00
Brad King
1421005835 ASM_MASM: Populate MSVC runtime library abstraction table 
In commit fb3370b6a1 (MSVC: Add abstraction for runtime library
selection, 2019-04-10, v3.15.0-rc1~229^2) we overlooked populating the
runtime library selection flags for the Microsoft assembler.  It does
not actually have any such flags, but since its compiler id is `MSVC`
our generators expect the table to be populated.  Use empty values.

Without this fix, enabling the `ASM_MASM` language with policy `CMP0091`
set to `NEW` causes an error due to the missing table entries.

Fixes: #20236, #19453
 2020-01-21 12:54:50 -05:00
Brad King
f45b2c4812 Merge topic 'FindGTK2-doc' 
763beb5944 FindGTK2: Fix documentation formatting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4256
 2020-01-21 12:39:00 -05:00
Brad King
763beb5944 FindGTK2: Fix documentation formatting 
Fixes: #20223
 2020-01-21 12:05:45 -05:00
Brad King
ba93119ac3 Merge branch 'release-3.16' 2020-01-21 11:37:52 -05:00
Vitaly Stakhovsky
5e54b0cf2f cmInstallGenerator: std::string params 
Several construction parameters converted to std::string
Also made a few class members const
 2020-01-21 11:09:35 -05:00
Brad King
8217a26d29 FindMPI: Fix regression when compiling with MPI wrappers 
The change in commit 5861c6d450 (FindMPI: Preserve include order when
extracting component directories, 2019-12-19) converted a CMake-language
function to a macro.  However, it contains a `return()` call that now
applies in the caller's scope, which is in correct.  The `return()` is
meant to skip work when using a MPI compiler wrapper as the main
compiler.  Move that condition to the call site instead.

Fixes: #20234
 2020-01-21 10:41:20 -05:00
Brad King
21e60da5bb CMake 3.16.3 v3.16.3 2020-01-21 10:17:47 -05:00
Brad King
958df7021f Merge topic 'mingw-find-no-dll' 
afbbfe5109 MinGW: Update find_library to not find plain .dll files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4248
 2020-01-21 09:52:20 -05:00
Brad King
65a3c68259 Tests: Make CMake.FileDownload invalid host name case more robust 
Use a well-defined `.invalid` top-level domain instead of assuming there
is no `.png` top-level domain.  Extend the timeout of this one case to
30 seconds to give DNS lookups a chance to fail instead of timing out.
 2020-01-21 09:37:45 -05:00
Brad King
7a89e3c36c Merge topic 'install-std-string' 
9db532f44d cmInstall*Generator: std::string params

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4241
 2020-01-21 09:21:51 -05:00
Vitaly Stakhovsky
9db532f44d cmInstall*Generator: std::string params 
Several construction parameters converted to std::string
Also made a few class members const
 2020-01-21 09:19:13 -05:00
Brad King
7d17ec2a2e Merge branch 'release-3.15' 2020-01-21 09:15:48 -05:00
Brad King
80223d5f0f Merge branch 'release-3.16' 2020-01-21 09:15:18 -05:00
Brad King
bcb0816cf9 Merge topic 'InstallRequiredSystemLibraries-redist' into release-3.16 
7ca923bcaf IRSL: Install msvcp140_{1,2,codecvt_ids}.dll if available

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Andrey Vihrov <andrey.vihrov@gmail.com>
Merge-request: !4247
 2020-01-21 09:15:17 -05:00
Brad King
01f0a5d3dd Merge topic 'InstallRequiredSystemLibraries-redist' 
7ca923bcaf IRSL: Install msvcp140_{1,2,codecvt_ids}.dll if available

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Andrey Vihrov <andrey.vihrov@gmail.com>
Merge-request: !4247
 2020-01-21 09:15:17 -05:00
Ben Boeckel
eb2da206d9 cmGlobalNinjaGenerator: only restat build.ninja 
This reduces the work that ninja needs to do on a CMake reconfigure.
 2020-01-21 08:57:51 -05:00
Marc Chevrier
edab5add57 cmMakefileTargetGenerator: modernize memory management 2020-01-21 12:52:05 +01:00
Kitware Robot
2f7e76efa4 CMake Nightly Date Stamp 2020-01-21 00:01:16 -05:00
Ben Boeckel
3ec82b713e cmMarkAsAdvancedCommand: ignore variables which don't exist in the cache 
Fixes: #18331
 2020-01-20 15:49:29 -05:00
Ben Boeckel
701a5c60e0 cmake: avoid marking local or unused variables as advanced 2020-01-20 15:49:29 -05:00
Ben Boeckel
af158149e7 FindOpenSSL: do not mark a local variable as advanced 2020-01-20 15:49:29 -05:00
Ben Boeckel
74f659f1f2 FindCurses: only mark CURSES_EXTRA_LIBRARY when it is used 2020-01-20 15:49:29 -05:00
Ben Boeckel
7e2ae4e96d FindOpenGL: only mark declared cache variables as advanced 2020-01-20 15:49:29 -05:00
Vitaly Stakhovsky
2e768924f3 cmLocalVisualStudio7Generator: clean up c_str() 2020-01-20 15:44:07 -05:00
Brad King
afbbfe5109 MinGW: Update find_library to not find plain .dll files 
Modern distributions of packages built with MinGW tools provide `.dll.a`
import libraries.  Prefer those instead of finding plain `.dll` files.
This avoids accidentally finding unrelated Windows `.dll` files.

Fixes: #20019
 2020-01-20 13:31:45 -05:00
Brad King
a3f9a9ab55 Merge branch 'InstallRequiredSystemLibraries-redist' into release-3.15 
Merge-request: !4247
 2020-01-20 13:22:22 -05:00
Brad King
7ca923bcaf IRSL: Install msvcp140_{1,2,codecvt_ids}.dll if available 
VS now distributes these additional runtime libraries.  Install them if
available.

Fixes: #20228
 2020-01-20 13:19:56 -05:00
Brad King
941c09616b Merge topic 'multi-ninja-pch' 
a55df20499 Multi-Ninja: Add precompile headers support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4201
 2020-01-20 11:59:28 -05:00
Brad King
56a3e84a67 Merge topic 'realpath-cache' 
9d5a554cc9 cmGlobalGenerator: Add cache for realpath() results

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4220
 2020-01-20 11:55:04 -05:00
Brad King
b168d8e855 Merge topic 'autogen_rcc_skip_unity' into release-3.16 
086d9b2bab Autogen: Enable SKIP_UNITY_BUILD_INCLUSION on AUTORCC generated files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Cristian Adam <cristian.adam@gmail.com>
Merge-request: !4237
 2020-01-20 11:54:13 -05:00
Brad King
a44b83c138 Merge branch 'release-3.16' 2020-01-20 11:54:13 -05:00
Brad King
6a5a23ea92 Merge topic 'autogen_rcc_skip_unity' 
086d9b2bab Autogen: Enable SKIP_UNITY_BUILD_INCLUSION on AUTORCC generated files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Cristian Adam <cristian.adam@gmail.com>
Merge-request: !4237
 2020-01-20 11:54:13 -05:00
Brad King
bf3142e253 Merge topic 'fphsa-name-mismatch' 
be4d1bdf9a FPHSA: acknowledge the name mismatches in CMake-owned modules
ee4673c1ae FPHSA: detect package name mismatches

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Eric Noulard <eric.noulard@gmail.com>
Merge-request: !4123
 2020-01-20 11:53:14 -05:00
Brad King
9b9dfacaa5 Merge topic 'acc-fix-in-source-depends-path' 
ba3a417dce Tests/CustomCommand: add a test for depending on a `./path`
e23475dc73 Tests/CustomCommand: fix custom command line to actually make its output
db4780d584 cmGeneratorTarget: search for relative paths to the binary directory
ec479f101f cmLocalGenerator: collapse the path after construction
fd0ba705ce add_custom_command: check if a relative path should be an in-source path
fd84f510f8 cmLocalGenerator: simplify the current source dir query

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4195
 2020-01-20 11:52:00 -05:00
Brad King
ac59da4c6a Merge topic 'stl-support' 
b9a3f2e7e2 STL Support: enhance behavior of cm::dynamic_reference_cast
04c2f67492 STL Support: extends type_traits for future developments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4216
 2020-01-20 11:51:07 -05:00