mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-04 21:30:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,276 Commits 2 Branches 401 Tags
cfa4d6b2e7103d23cde43bfc252c4ad4fc4c4c62
Commit Graph

50276 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King cfa4d6b2e7 Merge topic 'cmake-gui-windows-icon' 
f7ae4f572b cmake-gui: Restore application icon on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5362
 2020-10-13 12:39:50 -04:00
Brad King f7ae4f572b cmake-gui: Restore application icon on Windows 
In commit 41e223deb3 (CMake GUI: Split up into libraries, add test shim,
2020-09-14) the Windows resource source file that references the icon
was moved to CMakeGUILib, but it needs to be directly in the main
application in order to be attached properly.
 2020-10-13 12:09:28 -04:00
Brad King 884c484d23 Merge branch 'release-3.19' 2020-10-13 11:10:26 -04:00
Brad King 5d08006353 Merge topic 'cmake-gui-macos-icon' 
efe48189bf cmake-gui: Restore application icon on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5361
 2020-10-13 11:10:26 -04:00
Brad King f04bad9091 Merge topic 'cmake-gui-macos-icon' into release-3.19 
efe48189bf cmake-gui: Restore application icon on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5361
 2020-10-13 11:10:25 -04:00
Brad King efe48189bf cmake-gui: Restore application icon on macOS 
In commit 41e223deb3 (CMake GUI: Split up into libraries, add test shim,
2020-09-14) the macOS icon source file was moved to CMakeGUILib, but it
needs to be directly in the main application in order to be attached to
the `.app` in the right place.
 2020-10-13 10:35:14 -04:00
Kyle Edwards a1988e4c80 Merge topic 'explicit-source-extensions' 
fd50a75fa0 CMP0115: Require source file extensions to be explicit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5346
 2020-10-13 10:17:14 -04:00
Kyle Edwards fd50a75fa0 CMP0115: Require source file extensions to be explicit 2020-10-13 09:46:54 -04:00
Brad King 3b9150f360 Merge branch 'release-3.19' 2020-10-13 08:44:05 -04:00
Brad King 33ad20b8f9 Merge topic 'android-api-level-range' into release-3.19 
8e4aa63c7b Android: show supported API level in error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5358
 2020-10-13 08:44:04 -04:00
Brad King 375a694884 Merge topic 'android-api-level-range' 
8e4aa63c7b Android: show supported API level in error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5358
 2020-10-13 08:44:04 -04:00
Haibo Huang 8e4aa63c7b Android: show supported API level in error message 2020-10-13 08:40:44 -04:00
Brad King 595e440a3f Merge branch 'release-3.19' 2020-10-13 08:38:55 -04:00
Brad King 01ae8149b8 Merge topic 'android-verify-abi-in-ndk' into release-3.19 
5c2f9e3eeb Android: Fatal if ABI is not supported by NDK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5351
 2020-10-13 08:38:54 -04:00
Brad King 7e0cb5cab8 Merge topic 'android-verify-abi-in-ndk' 
5c2f9e3eeb Android: Fatal if ABI is not supported by NDK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5351
 2020-10-13 08:38:54 -04:00
Brad King df87db1fac Merge topic 'export-namelink-only-comment-removal' into release-3.19 
0a9af79995 export: Remove leftover inaccurate code comment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5359
 2020-10-13 08:27:18 -04:00
Brad King 897e7a0f7c Merge branch 'release-3.19' 2020-10-13 08:27:18 -04:00
Brad King 55aa375119 Merge topic 'export-namelink-only-comment-removal' 
0a9af79995 export: Remove leftover inaccurate code comment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5359
 2020-10-13 08:27:18 -04:00
Brad King ce6f9610b3 Merge topic 'FindPython-Apple-python3' into release-3.19 
5772ca0a53 FindPython: Ensure Apple Xcode python 3 is usable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5356
 2020-10-13 08:26:14 -04:00
Brad King dffcd07bcb Merge branch 'release-3.19' 2020-10-13 08:26:14 -04:00
Brad King 9c925e7170 Merge topic 'FindPython-Apple-python3' 
5772ca0a53 FindPython: Ensure Apple Xcode python 3 is usable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5356
 2020-10-13 08:26:14 -04:00
Craig Scott 0a9af79995 export: Remove leftover inaccurate code comment 
No functional changes.

Relates: !5352
 2020-10-13 21:38:29 +11:00
Kitware Robot 5e4f3ceef7 CMake Nightly Date Stamp 2020-10-13 00:01:16 -04:00
Craig Scott f9e02bc7c6 Merge branch 'release-3.19' 2020-10-12 19:19:33 -04:00
Craig Scott 343c8fe8ab Merge topic 'export-namelink-only' 
64690f6df0 export: Do not fail generation for namelink-only case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5352
 2020-10-12 19:19:33 -04:00
Craig Scott 446874a8a1 Merge topic 'export-namelink-only' into release-3.19 
64690f6df0 export: Do not fail generation for namelink-only case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5352
 2020-10-12 19:19:32 -04:00
Kyle Edwards 0673ad599e Merge branch 'release-3.19' 2020-10-12 14:04:41 -04:00
Kyle Edwards 55fce4425f Merge topic 'cmake-presets-documentation-fix' into release-3.19 
94c955e508 Tests: Test the CMakePresets.json example in the documentation
d6af1e83bc Help: Fix documentation of CMakePresets.json's cacheVariables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5353
 2020-10-12 14:04:41 -04:00
Kyle Edwards 9e9447a427 Merge topic 'cmake-presets-documentation-fix' 
94c955e508 Tests: Test the CMakePresets.json example in the documentation
d6af1e83bc Help: Fix documentation of CMakePresets.json's cacheVariables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5353
 2020-10-12 14:04:41 -04:00
Kyle Edwards 6437343c91 Merge topic 'ninja-multi-segfault' into release-3.19 
f4215ee57d Ninja Multi-Config: Fix segfault when installing an export
18372afcd4 Help: Fix documentation for Ninja Multi-Config's build.ninja

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5355
 2020-10-12 14:03:18 -04:00
Kyle Edwards db23015090 Merge branch 'release-3.19' 2020-10-12 14:03:18 -04:00
Kyle Edwards fa2db663c0 Merge topic 'ninja-multi-segfault' 
f4215ee57d Ninja Multi-Config: Fix segfault when installing an export
18372afcd4 Help: Fix documentation for Ninja Multi-Config's build.ninja

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5355
 2020-10-12 14:03:18 -04:00
Marc Chevrier 5772ca0a53 FindPython: Ensure Apple Xcode python 3 is usable 
The python 3 distributed as part of Xcode requires the specification
of a 'rpath' pointing at frameowrks root for a correct execution.

Fixes: #21293
 2020-10-12 15:45:55 +02:00
Kitware Robot 586cce897b CMake Nightly Date Stamp 2020-10-12 00:01:19 -04:00
Kitware Robot dda897234b CMake Nightly Date Stamp 2020-10-11 00:01:07 -04:00
Kitware Robot a4958a6f28 CMake Nightly Date Stamp 2020-10-10 00:01:15 -04:00
Deniz Bahadir 64690f6df0 export: Do not fail generation for namelink-only case 2020-10-09 22:29:22 +02:00
Kyle Edwards 94c955e508 Tests: Test the CMakePresets.json example in the documentation 2020-10-09 15:35:54 -04:00
Kyle Edwards 521847809f Merge topic 'ci-long-names' 
544ee0edc0 CI: Add a long filename to a build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5354
 2020-10-09 14:44:30 -04:00
Kyle Edwards f4215ee57d Ninja Multi-Config: Fix segfault when installing an export 
Fixes: #21290
 2020-10-09 13:51:01 -04:00
Kyle Edwards 18372afcd4 Help: Fix documentation for Ninja Multi-Config's build.ninja 2020-10-09 13:50:36 -04:00
Kyle Edwards 544ee0edc0 CI: Add a long filename to a build 
Nightly testing occasionally uncovers problems around long filenames
that were not found during gitlab-ci testing. Give a GitLab runner
a long filename to detect such problems.
 2020-10-09 13:13:52 -04:00
Kyle Edwards d6af1e83bc Help: Fix documentation of CMakePresets.json's cacheVariables 
cacheVariables is a map with variable names as the keys, but the
example in the documentation was not updated to reflect this. Fix
the example.
 2020-10-09 11:41:47 -04:00
Haibo Huang 5c2f9e3eeb Android: Fatal if ABI is not supported by NDK 2020-10-09 09:49:19 -04:00
Brad King 6ee22a56bc Merge branch 'release-3.19' 2020-10-09 09:40:04 -04:00
Brad King c6e4d97425 Merge topic 'iwyu-map-cm-headers' 
06c0d59c17 IWYU: Map <*> headers to <cm/*> headers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5327
 2020-10-09 09:40:04 -04:00
Brad King 3fb2112880 Merge topic 'iwyu-map-cm-headers' into release-3.19 
06c0d59c17 IWYU: Map <*> headers to <cm/*> headers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5327
 2020-10-09 09:40:03 -04:00
Brad King 2fe2a007de Merge branch 'release-3.19' 2020-10-09 09:38:20 -04:00
Brad King 5f2e1f2f3d Merge topic 'GNUInstallDirs-debian' into release-3.19 
798c1c3192 GNUInstallDirs: Comply with Debian Policy on LIBEXECDIR
75bcd3cf54 Tests: Add RunCMake.GNUInstallDirs expected output specific to Debian

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5349
 2020-10-09 09:38:20 -04:00
Brad King ab29036620 Merge topic 'GNUInstallDirs-debian' 
798c1c3192 GNUInstallDirs: Comply with Debian Policy on LIBEXECDIR
75bcd3cf54 Tests: Add RunCMake.GNUInstallDirs expected output specific to Debian

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5349
 2020-10-09 09:38:20 -04:00