mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-04 04:40:56 -06:00
Code Issues Packages Projects Releases Wiki Activity
55,451 Commits 2 Branches 385 Tags
c0d8e42a0858ab649d3cdeb2bee7253cf5efdf9b
Commit Graph

55451 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Boeckel
c0d8e42a08 gitlab-ci: shorten job prefixes 
This helps to maximize the amount of information visible in the GitLab
web interface.

Also document their meaning in the developer documentation and in the CI
configuration file directly.

See: https://gitlab.com/gitlab-org/gitlab/-/issues/8496
 2021-11-22 12:58:25 -05:00
Ben Boeckel
3c2fedfeaf gitlab-ci: fix comment typo 2021-11-22 12:58:25 -05:00
Brad King
df123f7d5f Merge topic 'FindGTest-target-for-gmock' 
50bf457a0d FindGTest: Add target for gmock library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6632
 2021-11-22 11:53:19 -05:00
Brad King
86047f75fc Merge topic 'cpack-productbuild-identifier' 
7213ceb869 CPack/productbuild: Add option to customize product identifier

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6738
 2021-11-22 11:26:43 -05:00
Eero Aaltonen
50bf457a0d FindGTest: Add target for gmock library 
`googlemock` has been absorbed into the
[googletest](https://github.com/google/googletest) project and is built
and installed from the same source tree.

As GTest may be built with or without GMock, skip GMock if it is not
present.

Do not provide result variables for GMock.  They are not provided by
upstream GTest's CMake Package Configuration File.

Also update the test case to cover linking to `GTest::gmock`.
 2021-11-22 11:23:39 -05:00
Brad King
1cbb956b34 Merge topic 'GNUInstallDirs-multiarch-prefixes' 
dd9584b352 GNUInstallDirs: Apply Debian multiarch LIBDIR to more prefixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6748
 2021-11-22 11:20:43 -05:00
Brad King
164fc9c5e5 Merge branch 'release-3.22' 2021-11-22 11:19:03 -05:00
Brad King
51390f0df2 Merge topic 'env-mod-path-list-separator' 
71a2c9d31b Help: ENVIRONMENT_MODIFICATION path_list_... separator is based on host

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6753
 2021-11-22 11:19:03 -05:00
Brad King
deb9b07636 Merge topic 'env-mod-path-list-separator' into release-3.22 
71a2c9d31b Help: ENVIRONMENT_MODIFICATION path_list_... separator is based on host

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6753
 2021-11-22 11:19:02 -05:00
Brad King
30d1850d7a Merge topic 'automoc-cross-windows' 
1e550ad02d AutoMoc: Only add the WIN32 define if the target system is Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6751
 2021-11-22 11:16:44 -05:00
Brad King
002e402489 Merge topic 'cudatoolkit_update_cusparse_deps' 
fedca357d2 FindCUDAToolkit: Correct cusparse dependencies for 10.1, 11.2.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6745
 2021-11-22 11:14:23 -05:00
Brad King
a90128f1a0 Merge branch 'release-3.22' 2021-11-22 11:12:46 -05:00
Brad King
879ba72123 Merge branch 'release-3.21' 2021-11-22 11:12:38 -05:00
Brad King
8431aea9ba Merge branch 'release-3.21' into release-3.22 2021-11-22 11:12:10 -05:00
Brad King
454344f35d Merge branch 'UseSWIG-create-workingdir' into release-3.22 
Merge-request: !6750
 2021-11-22 11:11:56 -05:00
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
Craig Scott
71a2c9d31b Help: ENVIRONMENT_MODIFICATION path_list_... separator is based on host 
Fixes: #22937
 2021-11-21 17:50:29 +11: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
Robert Maynard
fedca357d2 FindCUDAToolkit: Correct cusparse dependencies for 10.1, 11.2.2 2021-11-19 13:54:40 -05:00
Brad King
bad7959397 Merge branch 'UseSWIG-create-workingdir' into release-3.21 
Merge-request: !6750
 2021-11-19 12:12:07 -05:00
Joerg Bornemann
1e550ad02d AutoMoc: Only add the WIN32 define if the target system is Windows 
When there's no moc_predefs.h generated, we add the WIN32 define as
fallback.

Before this change, we added the WIN32 define if the host system was
Windows.  That's wrong when cross-compiling.  Now we're checking whether
the target system is Windows.

Fixes: #22933
 2021-11-19 17:56:19 +01: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
Mathieu Malaterre
dd9584b352 GNUInstallDirs: Apply Debian multiarch LIBDIR to more prefixes 
On typical Debian amd64 system (bullseye), multiarch is setup as:

```
% cat /etc/ld.so.conf.d/x86_64-linux-gnu.conf
/usr/local/lib/x86_64-linux-gnu
/lib/x86_64-linux-gnu
/usr/lib/x86_64-linux-gnu
```

Where:

```
% apt-cache policy libc6:amd64
libc6:
  Installed: 2.31-13+deb11u2
  Candidate: 2.31-13+deb11u2
  Version table:
 *** 2.31-13+deb11u2 500
        500 http://deb.debian.org/debian bullseye/main amd64 Packages
        100 /var/lib/dpkg/status
```

Update GNUInstallDirs to support all three cases `/`, `/usr/` and
`/usr/local/`.

Fixes: #19698
 2021-11-19 09:40:06 -05: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
Greg Fiumara
7213ceb869 CPack/productbuild: Add option to customize product identifier 
This adds a new option, CPACK_PRODUCTBUILD_IDENTIFIER, which allows
for customization of the productbuild product identifier within the
CPack productbuild generator.

Fixes: #20830
 2021-11-18 13:01:35 -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