mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 21:31:08 -06:00
Code Issues Packages Projects Releases Wiki Activity
58,836 Commits 2 Branches 385 Tags
5bfe33f09203448caaf22cea24427692ea295112
Commit Graph

58836 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Noël
5bfe33f092 CMakeFindFrameworks: Fix Brew 'Frameworks' path on Apple Silicon 
This approach is compatible with both Intel and Apple Silicon
architectures.

`/usr/local/Frameworks` was added in commit 9970cdcb59
(CMakeFindFrameworks: Allow custom framework locations, 2016-07-30,
v3.7.0-rc1~296^2) unconditionally, but does not work on Apple Silicon.

```
x86_64 (Intel macOS):
$ brew --prefix
/usr/local

arm64 (Apple Silicon macOS):
$ brew --prefix
/opt/homebrew
```
 2022-09-01 11:21:43 -04:00
Kitware Robot
8ac6634b2f CMake Nightly Date Stamp 2022-09-01 00:01:11 -04:00
Brad King
8c6794abc7 Merge topic 'ctest-target-alias-args' 
a79ccf7188 CTestTargets: Include CMAKE_CTEST_ARGUMENTS in CTEST_TEST_TARGET_ALIAS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7615
 2022-08-31 09:46:40 -04:00
Brad King
42a4fb1141 Merge topic 'tutorial_step2_update' 
80f5d28813 Tutorial: Update step 2 style

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7577
 2022-08-31 09:45:32 -04:00
Brad King
6a7c60f3a3 Merge topic 'FindOpenGL-clarify-output' 
3a3ecef473 FindOpenGL: Fix confusing output with CMP0072 and OpenGL preference

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7604
 2022-08-31 09:44:48 -04:00
Brad King
fc4451dd31 Merge topic 'xcode-add-gpu-validation-and-default-configuration' 
740bee97bd Xcode: Add settings to control a scheme's launch configuration
39456c70e1 Xcode: Add settings to control a scheme's GPU Validation values
4034272ed8 gitignore: Tell Git to ignore the .cache/ directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7581
 2022-08-31 09:43:50 -04:00
Brad King
f7fc864c3a Merge topic 'FindOpenSP-module' 
e706da5f7e FindOpenSP: Add module to find the OpenSP library
4bcdf1b992 ci: add OpenSP to Debian and Fedora base images

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7470
 2022-08-31 09:42:07 -04:00
Brad King
914ee5d2e5 Merge branch 'release-3.24' 2022-08-31 09:39:52 -04:00
Brad King
b9371c0477 Merge topic 'CMAKE_FIND_USE_INSTALL_PREFIX-support-staging-prefix' 
0fc10bb19b CMAKE_FIND_USE_INSTALL_PREFIX considers CMAKE_STAGING_PREFIX
43d31c5198 cmFindBase: Refactor CMAKE_FIND_USE_INSTALL_PREFIX handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7623
 2022-08-31 09:39:52 -04:00
Brad King
3aebeb1b55 Merge topic 'CMAKE_FIND_USE_INSTALL_PREFIX-support-staging-prefix' into release-3.24 
0fc10bb19b CMAKE_FIND_USE_INSTALL_PREFIX considers CMAKE_STAGING_PREFIX
43d31c5198 cmFindBase: Refactor CMAKE_FIND_USE_INSTALL_PREFIX handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7623
 2022-08-31 09:39:51 -04:00
Brad King
5b9750ee26 Merge branch 'release-3.24' 2022-08-31 09:38:52 -04:00
Brad King
f9a1eeb2b4 Merge topic 'test-symlinks-with-ccache' 
d3ac4e8246 Tests: Teach RunCMake.SymlinkTrees to tolerate CCACHE_BASEDIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7622
 2022-08-31 09:38:52 -04:00
Brad King
90aef0b92a Merge topic 'test-symlinks-with-ccache' into release-3.24 
d3ac4e8246 Tests: Teach RunCMake.SymlinkTrees to tolerate CCACHE_BASEDIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7622
 2022-08-31 09:38:50 -04:00
Brad King
01e14a9ca9 Merge branch 'release-3.24' 2022-08-31 09:37:46 -04:00
Brad King
aa7316a358 Merge topic 'doc-CMP0134-fixes' 
7dca3807f8 Help: Fix typos, grammar and formatting in CMP0134 policy docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7620
 2022-08-31 09:37:46 -04:00
Brad King
209af8f9a5 Merge topic 'doc-CMP0134-fixes' into release-3.24 
7dca3807f8 Help: Fix typos, grammar and formatting in CMP0134 policy docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7620
 2022-08-31 09:37:45 -04:00
Brad King
88b313a39f Merge branch 'release-3.24' 2022-08-31 09:35:59 -04:00
Brad King
bc0e2716dd Merge topic 'automoc-silence-warnings' 
fc8628389f automoc: avoid more compiler warnings in linker-warning-silencing code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7617
 2022-08-31 09:35:59 -04:00
Brad King
b8409fb1bc Merge topic 'automoc-silence-warnings' into release-3.24 
fc8628389f automoc: avoid more compiler warnings in linker-warning-silencing code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7617
 2022-08-31 09:35:57 -04:00
Brad King
47744c735b Merge branch 'release-3.24' 2022-08-31 09:29:51 -04:00
Brad King
33a51cdf1d Merge topic 'FindBoost-1.80' 
468a995346 FindBoost: Add support for Boost 1.80

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: مهدي شينون (Mehdi Chinoune) <mehdi.chinoune@hotmail.com>
Merge-request: !7600
 2022-08-31 09:29:51 -04:00
Brad King
35e73f513b Merge topic 'FindBoost-1.80' into release-3.24 
468a995346 FindBoost: Add support for Boost 1.80

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: مهدي شينون (Mehdi Chinoune) <mehdi.chinoune@hotmail.com>
Merge-request: !7600
 2022-08-31 09:29:49 -04:00
Kitware Robot
8bcc84283e CMake Nightly Date Stamp 2022-08-31 00:01:15 -04:00
Robert Maynard
0fc10bb19b CMAKE_FIND_USE_INSTALL_PREFIX considers CMAKE_STAGING_PREFIX 
Fixes #23900
 2022-08-30 17:52:40 -04:00
Brad King
d3ac4e8246 Tests: Teach RunCMake.SymlinkTrees to tolerate CCACHE_BASEDIR 
If the test is driven with a `ccache`-wrapped compiler then
the `CCACHE_BASEDIR` environment variable might break paths
the test checks.

Fixes: #23885
 2022-08-30 16:41:20 -04:00
Robert Maynard
43d31c5198 cmFindBase: Refactor CMAKE_FIND_USE_INSTALL_PREFIX handling 2022-08-30 15:26:30 -04:00
Albert Astals Cid
fc8628389f automoc: avoid more compiler warnings in linker-warning-silencing code 
Revise the approach from commit 844244ccdc (automoc: avoid compiler
warnings in linker-warning-silencing code, 2022-08-10, v3.24.1~6^2)
to avoid `-Wmissing-declarations` warnings too.

Issue: #23823
 2022-08-30 15:21:12 -04:00
Craig Scott
7dca3807f8 Help: Fix typos, grammar and formatting in CMP0134 policy docs 2022-08-30 15:11:09 -04:00
Cody Martin
a79ccf7188 CTestTargets: Include CMAKE_CTEST_ARGUMENTS in CTEST_TEST_TARGET_ALIAS 
Extend the change from commit 4153d8445b (Add CMAKE_CTEST_ARGUMENTS
variable to pass command-line arguments to ctest, 2019-12-28,
v3.17.0-rc1~150^2) to cover the test target alias created by
`CTEST_TEST_TARGET_ALIAS` too.

This should allow:

    set(CMAKE_CTEST_ARGUMENTS -T Test --no-compress-output)
    set(CTEST_TEST_TARGET_ALIAS runtests)
    include(CTest)

to use the arguments as part of `make runtests`.

Fixes: #22239
 2022-08-30 15:00:16 -04:00
Colton G. Rushton
3a3ecef473 FindOpenGL: Fix confusing output with CMP0072 and OpenGL preference 
If the legacy `GL` library is found, report that instead of GLVND's
`OpenGL` in the "found" message.
 2022-08-30 13:59:48 -04:00
Dawid Wróbel
e706da5f7e FindOpenSP: Add module to find the OpenSP library 
OpenSP has not seen a release in seventeen years, so is unlikely to ever
provide a CMake package configuration file.  Add a find module instead.
 2022-08-30 13:55:07 -04:00
Kargatum
468a995346 FindBoost: Add support for Boost 1.80 
Update the list of known versions.

Run the command

    cmake -DBOOST_DIR=/path/to/boost_1_80_0 \
      -P Utilities/Scripts/BoostScanDeps.cmake

to extract dependencies from the 1.80.0 source tree.
They are the same as 1.79's dependencies, so just update
the version check for warning about newer versions.
 2022-08-30 13:46:22 -04:00
Brad King
4bcdf1b992 ci: add OpenSP to Debian and Fedora base images 2022-08-30 12:46:03 -04:00
PatriceJiang
740bee97bd Xcode: Add settings to control a scheme's launch configuration 2022-08-30 10:28:27 -04:00
PatriceJiang
39456c70e1 Xcode: Add settings to control a scheme's GPU Validation values 2022-08-30 10:26:48 -04:00
PatriceJiang
4034272ed8 gitignore: Tell Git to ignore the .cache/ directory 2022-08-30 09:55:43 -04:00
Kitware Robot
60a1ccbd6a CMake Nightly Date Stamp 2022-08-30 00:01:12 -04:00
Markus Ferrell
80f5d28813 Tutorial: Update step 2 style 2022-08-29 15:43:53 -04:00
Kitware Robot
8f3ba34ea2 CMake Nightly Date Stamp 2022-08-29 00:01:25 -04:00
Craig Scott
8c381fdd41 Merge topic 'c-d-argument-order-doc' 
b2d07c3297 Help: Clarify that the order of -C and -D arguments matters

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7614
 2022-08-28 18:37:49 -04:00
Kitware Robot
d6fbfc94a1 CMake Nightly Date Stamp 2022-08-28 00:01:09 -04:00
Kitware Robot
526b39edbd CMake Nightly Date Stamp 2022-08-27 00:01:13 -04:00
Kyle Edwards
b2d07c3297 Help: Clarify that the order of -C and -D arguments matters 2022-08-26 13:55:33 -04:00
Craig Scott
bbda95e7bd Merge topic 'file-DOWNLOAD-existing-file-matched-message' 
666b3c6f13 Help: Clarify file(DOWNLOAD) behavior for existing file with same hash
87a40b720a file(DOWNLOAD): Fix message for existing file with matching hash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7599
 2022-08-26 06:53:46 -04:00
Craig Scott
8a47cd4b7e Merge branch 'release-3.24' 2022-08-26 06:50:40 -04:00
Craig Scott
7198d12d5e Merge topic 'correct_cupti_search_paths' 
1f3c3589f1 FindCUDAToolkit: Search the cuda toolkit include path for cupti

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7608
 2022-08-26 06:50:40 -04:00
Craig Scott
9b4efcb92f Merge topic 'correct_cupti_search_paths' into release-3.24 
1f3c3589f1 FindCUDAToolkit: Search the cuda toolkit include path for cupti

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7608
 2022-08-26 06:50:39 -04:00
Craig Scott
dc20dd3f44 Merge topic 'doc-export-compile-commands' 
a28fb5980b Help:CMAKE_[CTEST,CPACK]_COMMAND]: correct copy-paste error
1ed074cf6d Help:CMAKE_EXPORT_COMPILE_COMMANDS: link to Ninja Generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7610
 2022-08-26 06:47:08 -04:00
Craig Scott
4febca3e61 Merge topic 'doc-config-genex-version-note' 
302b22450e Help: $<CONFIG:...> supports multiple configs only since CMake 3.19

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7607
 2022-08-26 06:41:48 -04:00
Kitware Robot
71b7458f5b CMake Nightly Date Stamp 2022-08-26 00:01:13 -04:00