mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-04 13:19:51 -05:00
Code Issues Packages Projects Releases Wiki Activity
55,430 Commits 2 Branches 401 Tags
97ea8d30ed9ac11afd2f30077ec571e2c3db1508
Commit Graph

55430 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 97ea8d30ed Merge topic 'UseSWIG-create-workingdir' 
7224eb5185 UseSWIG: ensure directory for depfile exists

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6750
 2021-11-22 11:10:15 -05:00
Kitware Robot 75f36fe30d CMake Nightly Date Stamp 2021-11-22 00:01:11 -05:00
Kitware Robot 55d0c88309 CMake Nightly Date Stamp 2021-11-21 00:02:09 -05:00
Kitware Robot c5806da192 CMake Nightly Date Stamp 2021-11-20 00:02:10 -05:00
Marc Chevrier 7224eb5185 UseSWIG: ensure directory for depfile exists 
When `Visual Studio` and `Xcode` generators are used, directory for depfile
is not implicitely created by CMake when OUTFILE_DIR option is used.

Fixes: #22932
 2021-11-19 17:50:52 +01:00
Brad King eb9991ad62 Merge branch 'release-3.22' 2021-11-19 09:08:16 -05:00
Brad King 5cc6d7058a Merge topic 'ci-gmock' 
fae34ea007 ci: add gmock to Debian base images

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6746
 2021-11-19 09:08:16 -05:00
Brad King 354cd15029 Merge topic 'ci-gmock' into release-3.22 
fae34ea007 ci: add gmock to Debian base images

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6746
 2021-11-19 09:08:15 -05:00
Brad King 4a3480a786 Merge topic 'custom-command-unique_ptr' 
3bb2542535 cmMakefile: Simplify Add*Command and adopt to cmAddCustom*Command
c46b041a3b cmLocalGenerator: Simplify Add{Custom,Utility}Command
68b4e3b255 cmGlobalVisualStudio8Generator: Fix the misaligned argument, stdPipesUTF8
e37511ae7e cmMakefile: Simplify detail:::Add{Custom,Utility}Command
90e1206f25 cmMakefile: Introduce GeneratorAction as the class.
9b31a97748 cmCustomCommand: Move constructor arguments to individual setters
d0158b765b cmMakefile: Move CMP0116 lookup into Add{Custom,Utility}Command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6708
 2021-11-19 09:06:54 -05:00
Brad King 3519c19091 Merge topic 'ghs_initial_setup' 
aa59eaac4f GHS: Allow setting GHS variables from toolchain file
ab6f0b51b1 GHS: Add note about -T and path style
a55b5c4e18 GHS: Update BSP selection logic
0427f22539 GHS: Update RTOS selection logic
e006b87cc6 GHS: GHSMULTI - Update documentation to match implementation
83eb5695e9 GHS: Update toolset selection logic
8114ddcad1 GHS: Continue splitting variables used by generator
831607889f GHS: Update selection of primaryTarget in MULTI project file
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6715
 2021-11-19 09:05:35 -05:00
Kitware Robot 7d1cb6496e CMake Nightly Date Stamp 2021-11-19 00:02:14 -05:00
Brad King fae34ea007 ci: add gmock to Debian base images 
It is already in the Fedora base images.
 2021-11-18 12:54:32 -05:00
NAKAMURA Takumi 3bb2542535 cmMakefile: Simplify Add*Command and adopt to cmAddCustom*Command 2021-11-18 12:02:38 -05:00
NAKAMURA Takumi c46b041a3b cmLocalGenerator: Simplify Add{Custom,Utility}Command 2021-11-18 12:02:38 -05:00
NAKAMURA Takumi 68b4e3b255 cmGlobalVisualStudio8Generator: Fix the misaligned argument, stdPipesUTF8 
The call to AddCustomCommandToTarget for "Checking File Globs" had misaligned
arguments and previously passed `stdPipesUTF8` as `escapeOldStyle`.

For now, set `escapeOldStyle` as `true`. Also `stdPipesUTF8` is `true` here.
 2021-11-18 12:02:37 -05:00
NAKAMURA Takumi e37511ae7e cmMakefile: Simplify detail:::Add{Custom,Utility}Command 
Note 1: `detail::AddCustomCommandToTarget()` resets cc,
since cc is not moved away.

Note 2: In `detail::AddUtilityCommand()`, a few vars are preserved
before using. Their refs will be alive in most cases, but cc might
be destroyed in the future.
 2021-11-18 12:02:37 -05:00
NAKAMURA Takumi 90e1206f25 cmMakefile: Introduce GeneratorAction as the class. 2021-11-18 12:02:37 -05:00
NAKAMURA Takumi 9b31a97748 cmCustomCommand: Move constructor arguments to individual setters 
Make `cmCustomCommand` have just only default constructor.
Use each setter instead.  This follows the builder pattern.

Introduce `cc::SetOutputs(std::string output)`.
This will be used later, as substitution for `cc::SetOutputs({output})`.
 2021-11-18 12:02:37 -05:00
NAKAMURA Takumi d0158b765b cmMakefile: Move CMP0116 lookup into Add{Custom,Utility}Command 
Avoid repeating it at every call site.
 2021-11-18 12:02:37 -05:00
Brad King 2bad0145af Merge branch 'release-3.22' 2021-11-18 11:38:57 -05:00
Brad King ff8c3acc0f CMake 3.22.0 v3.22.0 2021-11-18 10:51:22 -05:00
Brad King 43fd3ca107 Merge branch 'release-3.22' 2021-11-18 10:38:24 -05:00
Brad King 6f613502f8 Merge topic 'fix-mingw32-gcc11-ice' 
26c9fbab46 MINGW-w64: Fix string(TIMESTAMP) build on 32bits.
f0eae9292b cmTimestamp: Declare component buffer before MinGW-specific code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6737
 2021-11-18 10:38:23 -05:00
Brad King b33cae9d2d Merge topic 'fix-mingw32-gcc11-ice' into release-3.22 
26c9fbab46 MINGW-w64: Fix string(TIMESTAMP) build on 32bits.
f0eae9292b cmTimestamp: Declare component buffer before MinGW-specific code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6737
 2021-11-18 10:38:22 -05:00
Antons Jeļkins 26c9fbab46 MINGW-w64: Fix string(TIMESTAMP) build on 32bits. 
Rephrase the string(TIMESTAMP) implementation not to
cause gcc-11 ICE on MSYS2/mingw32.

Fixes: #22916
 2021-11-18 09:17:38 -05:00
Antons Jeļkins f0eae9292b cmTimestamp: Declare component buffer before MinGW-specific code 2021-11-18 09:17:38 -05:00
Brad King dfb51bce7a Merge topic 'ci-nmake-jom' 
3b9975d9b5 ci: Add JOM nightly CI job
ec68e3c5c6 ci: Add NMake nightly CI job
bd00882f49 gitlab-ci: Factor out windows_vcvarsall_vs2022_x64 config block
99c335c8e8 gitlab-ci: Clarify MSVC v71 job script config block name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6742
 2021-11-18 09:04:54 -05:00
Brad King 10d250f780 Merge topic 'FindHDF5-Fortran-without-HL' 
86c697f49a FindHDF5: Fix Fortran compiler interrogation without HL library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6739
 2021-11-18 09:02:46 -05:00
Brad King e82ed27e0c Merge branch 'release-3.22' 2021-11-18 09:00:38 -05:00
Brad King 19d6125047 Merge branch 'release-3.21' 2021-11-18 09:00:36 -05:00
Brad King db39bd2322 Merge branch 'release-3.20' 2021-11-18 09:00:34 -05:00
Brad King a5eed9e5e0 Merge branch 'release-3.21' into release-3.22 2021-11-18 09:00:25 -05:00
Brad King c468f983c0 Merge branch 'release-3.20' into release-3.21 2021-11-18 09:00:15 -05:00
Brad King e8226516b6 Merge branch 'release-3.22' 2021-11-18 08:59:18 -05:00
Brad King e585dcedea Merge topic 'IntelLLVM-Fortran-copy-mod' 
209b896f2c IntelLLVM: Enable Fortran module rebuild avoidance in Makefile generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6740
 2021-11-18 08:59:18 -05:00
Brad King cb39d50e21 Merge topic 'IntelLLVM-Fortran-copy-mod' into release-3.22 
209b896f2c IntelLLVM: Enable Fortran module rebuild avoidance in Makefile generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6740
 2021-11-18 08:59:17 -05:00
Brad King dd37f0004a Merge branch 'release-3.22' 2021-11-18 08:57:27 -05:00
Brad King df978b0358 Merge topic 'backport-libuv-mingw-w64' 
acc14edd70 libuv: Backport MinGW-w64 compilation fix to CMake 3.22 branch

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6735
 2021-11-18 08:57:27 -05:00
Brad King e64a0b6c3d Merge topic 'backport-libuv-mingw-w64' into release-3.22 
acc14edd70 libuv: Backport MinGW-w64 compilation fix to CMake 3.22 branch

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6735
 2021-11-18 08:57:26 -05:00
Brad King 68d0e27570 Merge topic 'update-libuv' 
51d26933fe libuv: Fix clang-analyzer deadcode.DeadStores warning on Linux
f29bb586f0 libuv: Convert C++-style comment to C-style
8e7bb62bd5 libuv: Update CMake-internal buildsystem
0decc36fb1 libuv: Update uv__fs_copy_file_range signature in cmake-bootstrap.c
74a05716a4 Merge branch 'upstream-libuv' into update-libuv
27e34e6190 libuv 2021-11-09 (0f696da5)
65fb29fdfb libuv: Build unix tcp support during CMake bootstrap

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6736
 2021-11-18 08:55:22 -05:00
Kitware Robot 5e269798cc CMake Nightly Date Stamp 2021-11-18 00:02:14 -05:00
Brad King 3b9975d9b5 ci: Add JOM nightly CI job 2021-11-17 12:50:16 -05:00
Brad King ec68e3c5c6 ci: Add NMake nightly CI job 2021-11-17 12:49:43 -05:00
Brad King bd00882f49 gitlab-ci: Factor out windows_vcvarsall_vs2022_x64 config block 
Isolate the vcvarsall variables in a dedicated block.
 2021-11-17 12:07:45 -05:00
Brad King 99c335c8e8 gitlab-ci: Clarify MSVC v71 job script config block name 
Rename `cmake_test_windows_{nmake => msvc}` since it fetches MSVC,
not NMake.
 2021-11-17 12:07:40 -05:00
Brad King 80b6b201a6 Merge branch 'IntelLLVM-Fortran-copy-mod' into release-3.21 
Merge-request: !6740
 2021-11-17 10:42:51 -05:00
Brad King 7cc7f9aa26 Merge branch 'IntelLLVM-Fortran-copy-mod' into release-3.20 
Merge-request: !6740
 2021-11-17 10:42:37 -05:00
Brad King 209b896f2c IntelLLVM: Enable Fortran module rebuild avoidance in Makefile generators 
The Makefile generators use an internal `cmake -E cmake_copy_f90_mod`
tool to avoid rebuilding module consumers when the `.mod` content
changes only in a trivial way (e.g. the time it was built).  This is
done with logic specific to each vendor's module file format.  Enable
the "Intel" format support when using the IntelLLVM compiler (ifx) too.

Issue: #22922
 2021-11-17 10:41:30 -05:00
Håkon Strandenes 86c697f49a FindHDF5: Fix Fortran compiler interrogation without HL library 
When the HDF5 HL library is not available, FindHDF5 with Fortran does
not work.  The problem is because `cmake_hdf5_test.f90` tries to
"use h5lt" and "use h5ds", which comes from the HL library.
Then the basic compiler check fails completely.

The two "use" lines were added by commit 00405af0f1 (HDF5: Refactor the
use of compiler wrappers, 2016-04-04, v3.6.0-rc1~85^2) along with the
rest of the check.  Remove them.

Fixes: #22890
 2021-11-17 09:22:41 -05:00
Brad King b4bdedaf4e Merge topic 'iwyu-xcode' 
67c75064d1 Source: Fix IWYU warnings in Xcode generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6729
 2021-11-17 08:46:45 -05:00