summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ninja-depfile-transformation'Brad King2020-10-1461-68/+669
|\ | | | | | | | | | | | | | | | | | | 146e1e6ba1 Ninja: Transform DEPFILEs with policy CMP0116 596439b1bb cmCustomCommandGenerator: Add option to transform depfile b2c14bc774 cmake -E: Add cmake_transform_depfile internal command 946adadd40 cmGccDepfileReader: Rework helper code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5325
| * Ninja: Transform DEPFILEs with policy CMP0116Kyle Edwards2020-10-1323-3/+234
| | | | | | | | Fixes: #21267
| * cmCustomCommandGenerator: Add option to transform depfileKyle Edwards2020-10-134-37/+113
| |
| * cmake -E: Add cmake_transform_depfile internal commandKyle Edwards2020-10-1323-0/+249
| |
| * cmGccDepfileReader: Rework helper codeKyle Edwards2020-10-1313-28/+73
| | | | | | | | | | Fix some of the semantics of the depfile, add error handling, and refactor cmGccDepfileLexerHelper.
* | Merge topic 'ninja-multi-no-cache-variables'Brad King2020-10-142-23/+13
|\ \ | | | | | | | | | | | | | | | | | | 297ab15bf6 Ninja Multi-Config: Read configuration variables as normal variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5360
| * | Ninja Multi-Config: Read configuration variables as normal variablesKyle Edwards2020-10-132-23/+13
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Early versions of the Ninja Multi-Config generator required CMAKE_CONFIGURATION_TYPES and friends to be cache variables in order to support selecting the default config in cmake(1) --build. The behavior of cmake(1) --build has since been updated to no longer require this, and requiring these variables to be cache variables is inconsistent with the other generators. Read the variables as normal CMake variables like the other generators. This does not require a policy, since the only scenario where this would cause a breakage is one where the cache variable and the CMake variable are explicitly set to different values, which doesn't make sense to do anyway.
* | Merge topic 'file-GENERATE-refactor'Brad King2020-10-141-29/+73
|\ \ | | | | | | | | | | | | | | | | | | 2713a4fb37 file(GENERATE): Refactor options handling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5315
| * | file(GENERATE): Refactor options handlingAsit Dhal2020-10-121-29/+73
| | |
* | | Merge topic 'FindIntl_use_imported_targets'Brad King2020-10-148-8/+78
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c30d06b7e6 FindIntl: Add imported target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5333
| * | | FindIntl: Add imported targetSibi Siddharthan2020-10-138-8/+78
| | | | | | | | | | | | | | | | | | | | Fixes: #21271 Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
* | | | Merge topic 'post-rel-dev'Brad King2020-10-148-7/+38
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b13f1a527 Help/dev: Add maintainer guide step for post-release policy updates a0e474aaf2 Configure CMake itself with policies through CMake 3.18 3eaf053940 export: Increase maximum policy version in exported files to 3.18 2b218883cd Add deprecation warnings for policies CMP0075 and below Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5363
| * | | | Help/dev: Add maintainer guide step for post-release policy updatesBrad King2020-10-131-0/+10
| | | | |
| * | | | Configure CMake itself with policies through CMake 3.18Brad King2020-10-133-3/+3
| | | | |
| * | | | export: Increase maximum policy version in exported files to 3.18Brad King2020-10-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The files generatd by `install(EXPORT)` and `export()` commands are known to work with policies as of CMake 3.18, so enable them in sufficiently new CMake versions.
| * | | | Add deprecation warnings for policies CMP0075 and belowBrad King2020-10-133-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OLD behaviors of all policies are deprecated, but only by documentation. Add an explicit deprecation diagnostic for policies introduced in CMake 3.12 and below to encourage projects to port away from setting policies to OLD.
* | | | | Merge branch 'release-3.19'Brad King2020-10-140-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'cmake-gui-res' into release-3.19Brad King2020-10-141-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 440ee739c4 cmake-gui: Attach icons only to main GUI executables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5368
* | \ \ \ \ \ Merge topic 'cmake-gui-res'Brad King2020-10-141-2/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 440ee739c4 cmake-gui: Attach icons only to main GUI executables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5368
| * | | | | | cmake-gui: Attach icons only to main GUI executablesBrad King2020-10-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge branch 'release-3.19'Kyle Edwards2020-10-140-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'cmake-help-fix' into release-3.19Kyle Edwards2020-10-141-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d811ceb3a Help: Fix invalid code-block in cmake(1) manual Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5369
* | | | | | | Merge topic 'cmake-help-fix'Kyle Edwards2020-10-141-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d811ceb3a Help: Fix invalid code-block in cmake(1) manual Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5369
| * | | | | | Help: Fix invalid code-block in cmake(1) manualKyle Edwards2020-10-141-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Fixes: #21304
* | | | | | CMake Nightly Date StampKitware Robot2020-10-141-1/+1
| |/ / / / |/| | | |
* | | | | Merge branch 'release-3.19' into masterBrad King2020-10-130-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | CMake 3.19.0-rc1v3.19.0-rc1Brad King2020-10-131-1/+1
| | | | |
* | | | | Merge branch 'release-3.19'Brad King2020-10-130-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge topic 'cmake-gui-windows-icon' into release-3.19Brad King2020-10-131-5/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7ae4f572b cmake-gui: Restore application icon on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5362
* | \ \ \ \ Merge topic 'cmake-gui-windows-icon'Brad King2020-10-131-5/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | f7ae4f572b cmake-gui: Restore application icon on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5362
| * | | | | cmake-gui: Restore application icon on WindowsBrad King2020-10-131-5/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge branch 'release-3.19'Brad King2020-10-130-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge topic 'cmake-gui-macos-icon' into release-3.19Brad King2020-10-131-6/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | \ \ \ \ Merge topic 'cmake-gui-macos-icon'Brad King2020-10-131-6/+6
|\ \ \ \ \ \ | | |/ / / / | |/| | | / | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | 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
| * | | | cmake-gui: Restore application icon on macOSBrad King2020-10-131-6/+6
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge topic 'explicit-source-extensions'Kyle Edwards2020-10-1321-21/+208
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | CMP0115: Require source file extensions to be explicitKyle Edwards2020-10-1321-21/+208
| | | | |
* | | | | Merge branch 'release-3.19'Brad King2020-10-130-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'android-api-level-range' into release-3.19Brad King2020-10-131-1/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e4aa63c7b Android: show supported API level in error message Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5358
* | \ \ \ \ Merge topic 'android-api-level-range'Brad King2020-10-131-1/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e4aa63c7b Android: show supported API level in error message Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5358
| * | | | | Android: show supported API level in error messageHaibo Huang2020-10-131-1/+2
| |/ / / /
* | | | | Merge branch 'release-3.19'Brad King2020-10-130-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge topic 'android-verify-abi-in-ndk' into release-3.19Brad King2020-10-132-1/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c2f9e3eeb Android: Fatal if ABI is not supported by NDK Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5351
* | \ \ \ \ Merge topic 'android-verify-abi-in-ndk'Brad King2020-10-132-1/+7
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c2f9e3eeb Android: Fatal if ABI is not supported by NDK Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5351
| * | | | | Android: Fatal if ABI is not supported by NDKHaibo Huang2020-10-092-1/+7
| | | | | |
* | | | | | Merge branch 'release-3.19'Brad King2020-10-130-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge topic 'export-namelink-only-comment-removal' into release-3.19Brad King2020-10-131-1/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0a9af79995 export: Remove leftover inaccurate code comment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5359
* | \ \ \ \ \ Merge topic 'export-namelink-only-comment-removal'Brad King2020-10-131-1/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0a9af79995 export: Remove leftover inaccurate code comment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5359
| * | | | | | export: Remove leftover inaccurate code commentCraig Scott2020-10-131-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No functional changes. Relates: !5352
* | | | | | | Merge branch 'release-3.19'Brad King2020-10-130-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
generated by cgit v0.12 at 2025-01-07 22:40:29 (GMT)