mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-09 10:00:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,245 Commits 2 Branches 392 Tags
f0ac977d3cae2ed1618a88c5a38dba0ceb16ab41
Commit Graph

50245 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Issam E. Maghni
f0ac977d3c bootstrap: add samu as known ninja processors 
As found in “Modules/CMakeNinjaFindMake.cmake”
 2020-10-14 15:28:50 -04:00
Brad King
1356230b07 Merge topic 'cmake-gui-res' into release-3.19 
440ee739c4 cmake-gui: Attach icons only to main GUI executables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5368
 2020-10-14 10:51:32 -04:00
Kyle Edwards
ad17001931 Merge topic 'cmake-help-fix' into release-3.19 
7d811ceb3a Help: Fix invalid code-block in cmake(1) manual

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5369
 2020-10-14 10:09:06 -04:00
Kyle Edwards
7d811ceb3a Help: Fix invalid code-block in cmake(1) manual 
Fixes: #21304
 2020-10-14 09:47:28 -04:00
Brad King
440ee739c4 cmake-gui: Attach icons only to main GUI executables 
In commit efe48189bf (cmake-gui: Restore application icon on macOS,
2020-10-13, v3.19.0-rc1~2^2) and commit f7ae4f572b (cmake-gui: Restore
application icon on Windows, 2020-10-13, v3.19.0-rc1~1^2) we attached
the icon source files to all consumers of `CMakeGUILib`, but that
includes other libraries like `CMakeGUIMainLib`.  The latter library is
meant only for direct consumption by a GUI executable, so use that to
propagate the icons instead.
 2020-10-14 09:35:58 -04:00
Brad King
0b0df2d063 CMake 3.19.0-rc1 v3.19.0-rc1 2020-10-13 12:40:27 -04:00
Brad King
7e52b82611 Merge topic 'cmake-gui-windows-icon' into release-3.19 
f7ae4f572b cmake-gui: Restore application icon on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5362
 2020-10-13 12:39:49 -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
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
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
Haibo Huang
8e4aa63c7b Android: show supported API level in error message 2020-10-13 08:40:44 -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
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
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
Craig Scott
0a9af79995 export: Remove leftover inaccurate code comment 
No functional changes.

Relates: !5352
 2020-10-13 21:38:29 +11: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
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
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
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
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
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
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
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
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
Kyle Edwards
06c0d59c17 IWYU: Map <*> headers to <cm/*> headers 
For headers which exclusively contain things that were not present
in C++11.
 2020-10-08 13:40:21 -04:00
Brad King
488141fe37 Merge topic 'rel-3.19-policy-settings' into release-3.19 
ac765f5eff FetchContent: Remove unnecessary policy CMP0114 setting
62e73a7d10 Tests: Fix policy version in RunCMake.ExternalProject test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5350
 2020-10-08 12:19:10 -04:00
Brad King
ac765f5eff FetchContent: Remove unnecessary policy CMP0114 setting 
Now that `CMAKE_VERSION` is at least 3.19, the policy will be set to NEW
implicitly by the version.
 2020-10-08 11:59:05 -04:00
Brad King
62e73a7d10 Tests: Fix policy version in RunCMake.ExternalProject test 
Now that we have policies that need to be tested, this test cannot
just use CMAKE_VERSION for the policy level.
 2020-10-08 11:58:06 -04:00
Brad King
302b00a262 Begin 3.19 release versioning 2020-10-08 11:23:38 -04:00
Brad King
16324555ab gitlab-ci: Drop package pipeline upload jobs for release branch 
The package pipeline for release versions should not upload packages
automatically to our archive of nightly development versions.
 2020-10-08 11:22:56 -04:00
Brad King
b16eb7c76d Help: Drop development topic notes to prepare release 
Release versions do not have the development topic section of
the CMake Release Notes index page.
 2020-10-08 11:22:38 -04:00
Brad King
85c2bb724f Merge topic 'doc-3.19-relnotes' 
e1ab55b4ca Help: Update Sphinx versionadded directives for 3.19 release
1b6c0b375e Help: Organize and revise 3.19 release notes
b81cb27f20 Help: Consolidate 3.19 release notes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5345
 2020-10-08 11:21:04 -04:00
Dennis Klein
798c1c3192 GNUInstallDirs: Comply with Debian Policy on LIBEXECDIR 
If CMAKE_INSTALL_PREFIX is /usr, CMAKE_INSTALL_LIBEXECDIR shall return
the same value as CMAKE_INSTALL_LIBDIR on Debian.

While the FHS allows /usr/libexec for internal binaries
(https://refspecs.linuxfoundation.org/FHS_3.0/fhs-3.0.html#usrlibexec) the
Debian Policy Manual states an exception here (section 9.1.1 bullet point 4):
https://www.debian.org/doc/debian-policy/ch-opersys#file-system-structure.

Fixes: #21287
 2020-10-08 11:10:41 -04:00
Brad King
75bcd3cf54 Tests: Add RunCMake.GNUInstallDirs expected output specific to Debian 2020-10-08 11:09:37 -04:00
Brad King
e1ab55b4ca Help: Update Sphinx versionadded directives for 3.19 release 
Run the script:

    Utilities/Sphinx/update_versions.py --since v3.18.0 --overwrite
 2020-10-08 09:30:26 -04:00
Brad King
1b6c0b375e Help: Organize and revise 3.19 release notes 
Add section headers similar to the 3.18 release notes and move each
individual bullet into an appropriate section.  Revise a few bullets.
 2020-10-08 09:30:25 -04:00
Brad King
b81cb27f20 Help: Consolidate 3.19 release notes 
Run the `Utilities/Release/consolidate-relnotes.bash` script to move
notes from `Help/release/dev/*` into `Help/release/3.19.rst`.
 2020-10-08 09:30:25 -04:00
Brad King
8f2ba9a3fc Merge topic 'ignore_MSB_warnings' 
b756ec8a46 cm_cxx_features: Filter out MSBXXXX warnings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5348
 2020-10-08 09:29:02 -04:00
Anonymous Maarten
b756ec8a46 cm_cxx_features: Filter out MSBXXXX warnings 
When building CMake in `%TMP%` on Windows, MSBuild issues warnings.
Filter those out to avoid breaking C++ feature checks.

Fixes: #21270
 2020-10-08 09:24:02 -04:00
Brad King
20d140c894 Merge topic 'android-ndk-r22' 
1ab574a0f4 Android: Add support for NDK r22
91a362d2fa Android: Drop redundant setting of CMP0057 in Android-Determine
0b082c5253 Android: Select Android API after ABI is determined

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5332
 2020-10-08 09:23:37 -04:00
Brad King
bc19ceb6fe Merge topic 'check_cuda_helpers' 
5c66ac31e6 CUDA: CheckLinkerFlag now supports CUDA
da2622ff36 CUDA: Add Support to SourceCompiles|Runs and CheckCompilerFlags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5338
 2020-10-08 09:22:21 -04:00
Robert Maynard
5c66ac31e6 CUDA: CheckLinkerFlag now supports CUDA 2020-10-08 08:30:59 -04:00
Robert Maynard
da2622ff36 CUDA: Add Support to SourceCompiles|Runs and CheckCompilerFlags 2020-10-08 08:30:59 -04:00
Brad King
96dcf07d33 Merge topic 'FindwxWidgets-freebsd' 
1fe5abb47f FindwxWidgets: Expand list of names for wx-config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5342
 2020-10-08 08:10:41 -04:00
Brad King
736cd0f533 Merge topic 'FindJNI-freebsd' 
79bfa0f75e FindJNI: Search in FreeBSD standard locations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5341
 2020-10-08 08:09:53 -04:00
Brad King
ef889ede4c Merge topic 'FindPython-fix-tests-failures' 
2549dc7c93 FindPython: Enable C language in tests that find the Development component

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5344
 2020-10-08 08:08:08 -04:00