mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-29 02:19:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
55,487 Commits 2 Branches 401 Tags
b7c679f03a1ee1827755d95778201b489fa02a76
Commit Graph

55487 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King b7c679f03a Merge topic 'compiler-id-classic-c' 
0fc8b2f61c CompilerId: Restore support for classic C by avoiding C++ style comments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Raul Tambre <raul@tambre.ee>
Merge-request: !6759
 2021-11-29 12:27:37 -05:00
Kitware Robot f9a657ee5d CMake Nightly Date Stamp 2021-11-29 00:01:25 -05:00
Kitware Robot dea324f804 CMake Nightly Date Stamp 2021-11-28 00:02:26 -05:00
Kitware Robot 56e6f68d5a CMake Nightly Date Stamp 2021-11-27 00:02:10 -05:00
Kitware Robot 9b6ad5d528 CMake Nightly Date Stamp 2021-11-26 00:01:07 -05:00
Kitware Robot 12d4372b58 CMake Nightly Date Stamp 2021-11-25 00:02:07 -05:00
Kitware Robot dfc8eb90eb CMake Nightly Date Stamp 2021-11-24 00:01:45 -05:00
Brad King cbc1d1b536 Merge branch 'release-3.22' 2021-11-23 11:40:12 -05:00
Brad King 0c1f8a5a7c Merge topic 'ci-rename-jobs' 
580e20d0d4 Merge branch 'backport-ci-rename-jobs' into ci-rename-jobs
7d5828e293 gitlab-ci: shorten job prefixes
cfa478e518 gitlab-ci: fix comment typo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6760
 2021-11-23 11:40:12 -05:00
Brad King 9f07f1939b Merge topic 'ci-rename-jobs' into release-3.22 
7d5828e293 gitlab-ci: shorten job prefixes
cfa478e518 gitlab-ci: fix comment typo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6760
 2021-11-23 11:40:11 -05:00
Brad King 28093b5efd Merge branch 'release-3.22' 2021-11-23 10:30:28 -05:00
Brad King f4687e2d3e Merge branch 'release-3.21' 2021-11-23 10:30:27 -05:00
Brad King ba20241422 Merge branch 'release-3.21' into release-3.22 2021-11-23 10:30:20 -05:00
Brad King 580e20d0d4 Merge branch 'backport-ci-rename-jobs' into ci-rename-jobs 2021-11-23 10:13:23 -05:00
Ben Boeckel 7d5828e293 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-23 10:11:25 -05:00
Ben Boeckel cfa478e518 gitlab-ci: fix comment typo 2021-11-23 10:06:32 -05:00
Brad King 0fc8b2f61c CompilerId: Restore support for classic C by avoiding C++ style comments 
C++ style comments were added by commit fc3a1cbdd8 (CompilerID: Compiler
extensions default detection, 2021-05-29, v3.22.0-rc1~52^2~2), but they
may not be supported by the default mode of some C compilers.  Use
C-style comments instead.  For consistency, do this for all languages.

Fixes: #22942
 2021-11-23 10:00:31 -05:00
Brad King 501766ff4e Merge topic 'iwyu-windows' 
0e58a5ea07 Source: Fix possible IWYU warnings in Windows generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6749
 2021-11-23 10:00:22 -05:00
Brad King 3b431c226a Merge branch 'release-3.22' 2021-11-23 09:55:18 -05:00
Brad King 4133c426c2 Merge topic 'env-init-configs' 
5b1ed2a646 try_compile: Do not use CMAKE_BUILD_TYPE or CMAKE_CONFIGURATION_TYPES env vars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6755
 2021-11-23 09:55:17 -05:00
Brad King b414cd3587 Merge topic 'env-init-configs' into release-3.22 
5b1ed2a646 try_compile: Do not use CMAKE_BUILD_TYPE or CMAKE_CONFIGURATION_TYPES env vars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6755
 2021-11-23 09:55:16 -05:00
Brad King 0e0a2f3fe2 Merge branch 'release-3.22' 2021-11-23 09:53:43 -05:00
Brad King eaef62ec3b Merge topic 'doc-policy-default' 
69b70968bd Help: Suggest CMAKE_POLICY_DEFAULT_CMP0126 in CMP0126 docs
5b1c24255f Help: Suggest CMAKE_POLICY_DEFAULT_CMP0077 in CMP0077 docs
c44636a89b Help: Document more use cases for CMAKE_POLICY_DEFAULT_CMPNNNN

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6756
 2021-11-23 09:53:43 -05:00
Brad King 0bd48412a1 Merge topic 'doc-policy-default' into release-3.22 
69b70968bd Help: Suggest CMAKE_POLICY_DEFAULT_CMP0126 in CMP0126 docs
5b1c24255f Help: Suggest CMAKE_POLICY_DEFAULT_CMP0077 in CMP0077 docs
c44636a89b Help: Document more use cases for CMAKE_POLICY_DEFAULT_CMPNNNN

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6756
 2021-11-23 09:53:42 -05:00
Brad King e18bed1bc1 Merge branch 'release-3.22' 2021-11-23 09:52:49 -05:00
Brad King e614cb037b Merge topic 'ci-xcode-13.1' 
224d81e804 gitlab-ci: update macOS jobs to use Xcode 13.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6757
 2021-11-23 09:52:49 -05:00
Brad King 6bab24e0d3 Merge topic 'ci-xcode-13.1' into release-3.22 
224d81e804 gitlab-ci: update macOS jobs to use Xcode 13.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6757
 2021-11-23 09:52:48 -05:00
Brad King 69c69ded5c Merge topic 'ci-rename-jobs' 
c0d8e42a08 gitlab-ci: shorten job prefixes
3c2fedfeaf gitlab-ci: fix comment typo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6744
 2021-11-23 09:52:01 -05:00
Kitware Robot 7fb6a778ce CMake Nightly Date Stamp 2021-11-23 00:01:07 -05:00
Brad King b54d61c4a0 Merge branch 'ci-xcode-13.1' into release-3.21 
Merge-request: !6757
 2021-11-22 19:40:47 -05:00
Brad King 224d81e804 gitlab-ci: update macOS jobs to use Xcode 13.1 2021-11-22 18:04:43 -05:00
Brad King 69b70968bd Help: Suggest CMAKE_POLICY_DEFAULT_CMP0126 in CMP0126 docs 2021-11-22 14:57:22 -05:00
Brad King 5b1c24255f Help: Suggest CMAKE_POLICY_DEFAULT_CMP0077 in CMP0077 docs 
Issue: #20490
 2021-11-22 14:56:17 -05:00
Brad King c44636a89b Help: Document more use cases for CMAKE_POLICY_DEFAULT_CMPNNNN 2021-11-22 14:55:36 -05:00
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 5b1ed2a646 try_compile: Do not use CMAKE_BUILD_TYPE or CMAKE_CONFIGURATION_TYPES env vars 
Since:

* commit e216b9bbd3 (cmake: Allow CMAKE_BUILD_TYPE to be set by
                     environment variable, 2021-06-29, v3.22.0-rc1~503^2~1)
* commit ef56eefc9b (cmake: Allow CMAKE_CONFIGURATION_TYPES to be set by
                     environment variable, 2021-06-29, v3.22.0-rc1~503^2)

the environment variables are supposed to provide defaults for settings
the user otherwise can control via cache entries.  However, they
accidentally affect `try_compile` projects too, which are supposed to be
programmatically controlled.

Fixes: #22935
 2021-11-22 12:50:42 -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