summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'mingw-clang-c-compile-features'Brad King2017-11-011-1/+1
|\ | | | | | | | | | | | | f86879a0 Record C compile features flags for MinGW Clang on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1435
| * Record C compile features flags for MinGW Clang on WindowsBrad King2017-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done for C++ by commit v3.5.0-rc1~69^2 (Record compile features for MinGW Clang on Windows, 2016-01-11). Make the same change for C. The `UNIX` condition on Clang C compiler features was already dropped by refactoring in commit v3.9.0-rc1~17^2~4 (Compilers: Port to use default cmake_record_lang_compile_features macros, 2017-05-10). Our documentation already claims support for this combination. This was simply an oversight when support was added for MinGW Clang C++. Issue: #15897 Issue: #15943
* | CMake Nightly Date StampKitware Robot2017-11-011-1/+1
| |
* | Merge branch 'release-3.10'Brad King2017-10-310-0/+0
|\ \
| * \ Merge branch 'autogen-change-rcc-config-suffix' into release-3.10Brad King2017-10-301-2/+2
| |\ \ | | | | | | | | | | | | Merge-request: !1425
* | \ \ Merge topic 'autogen-change-rcc-config-suffix'Brad King2017-10-311-2/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | bda0875a Autogen: Make rcc output file suffix static (instead of pseudo-random) Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Taylor Braun-Jones <taylor@braun-jones.org> Merge-request: !1425
| * | | Autogen: Make rcc output file suffix static (instead of pseudo-random)Sebastian Holtermann2017-10-301-2/+2
| |/ /
* | | Merge topic 'update-vim-syntax'Brad King2017-10-314-22/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a6cdbae update vim-syntax to latest cmake-commit 11225ec6 vim-cmake-syntax 2017-10-31 (a8a846f0) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1431
| * \ \ update vim-syntax to latest cmake-commitPatrick Boettcher2017-10-314-22/+33
| |\ \ \
| | * | | vim-cmake-syntax 2017-10-31 (a8a846f0)vim-cmake-syntax upstream2017-10-314-23/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/pboettch/vim-cmake-syntax.git at commit a8a846f067e8d8bf565c27a1943017f9fce5a5b7 (master). Upstream Shortlog ----------------- Dimitri Merejkowsky (4): 4e3a59ce Small cleanups asked by Bram ecff9926 Add Dimitri as maintainer for the indent file too c6a2f171 indent/cmake.vim: save and restore cpo option f2a8a21b cmake indent: replace &sw by shiftwidth() Patrick Boettcher (2): 9e9ad02e do not force expandtabs for all cmake-users a8a846f0 update keywords to 3.10.20171031-gfd2e6
* | | | | Merge topic 'cmp0037-conditional-targets'Brad King2017-10-3141-145/+341
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae5f4069 CMP0037: Allow test and package targets when features are not enabled 409527a0 CMP0037: De-duplicate check and message generation a2611d81 Tests: Add RunCMake.CMP0037 case for WARN on reserved targets 103501c4 Tests: Do not enable languages in all cases of RunCMake.CMP0037 2d0b3e6e cmGlobalGenerator: Refactor test and package target conditions Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !1417
| * | | | | CMP0037: Allow test and package targets when features are not enabledBrad King2017-10-3026-5/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When CMake will not generate a test, package, or package_source target, allow projects to create their own targets with these names. Fixes: #16062
| * | | | | CMP0037: De-duplicate check and message generationBrad King2017-10-305-91/+48
| | | | | |
| * | | | | Tests: Add RunCMake.CMP0037 case for WARN on reserved targetsBrad King2017-10-263-0/+41
| | | | | |
| * | | | | Tests: Do not enable languages in all cases of RunCMake.CMP0037Brad King2017-10-268-8/+8
| | | | | |
| * | | | | cmGlobalGenerator: Refactor test and package target conditionsBrad King2017-10-261-42/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In `AddGlobalTarget_{Test,Package,PackageSource}`, check conditions up front and return early if the targets are not needed. This reduces the indentation of the main logic.
* | | | | | Merge topic '15468-xcode-hide-zero-check-source-group'Brad King2017-10-311-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89add9b3 Xcode: Do not create ZERO_CHECK source group Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1429
| * | | | | | Xcode: Do not create ZERO_CHECK source groupGregor Jasny2017-10-301-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #15468
* | | | | | | Merge topic 'vs-hlsl-opt-dbg'Brad King2017-10-315-0/+42
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 025221df VS: Add source file property to set hlsl debug and optimization flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1420
| * | | | | | | VS: Add source file property to set hlsl debug and optimization flagsJeremiah van Oosten2017-10-305-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `VS_SHADER_DISABLE_OPTIMIZATIONS` and `VS_SHADER_ENABLE_DEBUG` source file properties to control these settings on `.hlsl` files in the VS generator. Fixes: #17406
* | | | | | | | Merge topic 'minifixes'Brad King2017-10-312-8/+11
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a4a61d9 cmForEachCommand: prevent leakage 52680d80 cm_codecvt: cleanup superfluous semicolons Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1402
| * | | | | | | cmForEachCommand: prevent leakageMatthias Maennich2017-10-301-2/+3
| | | | | | | |
| * | | | | | | cm_codecvt: cleanup superfluous semicolonsMatthias Maennich2017-10-301-6/+8
| | |/ / / / / | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-10-311-1/+1
|/ / / / / /
* | | | | | Merge topic 'vs-diagnostics-flag'Brad King2017-10-301-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82f95c95 VS generator: support /diagnostics compiler flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1411
| * | | | | | VS generator: support /diagnostics compiler flagJustin Goshi2017-10-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding support for this flag so a user can specify it via the CMAKE_CXX_FLAGS variable.
* | | | | | | Merge branch 'release-3.10'Brad King2017-10-300-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'autogen-qrc-file-name' into release-3.10Brad King2017-10-301-5/+15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1422
| * \ \ \ \ \ \ Merge branch 'cpack-rpm-dist-test-fix' into release-3.10Brad King2017-10-301-0/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1424
| * \ \ \ \ \ \ \ Merge branch 'backport-fix-co-compile' into release-3.10Brad King2017-10-2716-87/+175
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1418
| * \ \ \ \ \ \ \ \ Merge branch 'autogen-static-library-cycles' into release-3.10Brad King2017-10-2710-17/+172
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1408
| * \ \ \ \ \ \ \ \ \ Merge branch 'cmp0040-wording' into release-3.10Brad King2017-10-263-5/+5
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1415
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'freetype-windows'Brad King2017-10-301-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3d42c3ed FindFreetype: Normalize slashes when legacy FREETYPE_LIBRARY is specified Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1416
| * | | | | | | | | | | | FindFreetype: Normalize slashes when legacy FREETYPE_LIBRARY is specifiedMark Salisbury2017-10-271-0/+3
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows if you specify the library path using a regular Windows path with backslashes, FindFreetype announces that it found the library, but the value is reported with backslashes instead of forward slashes. This breaks assumptions elsewhere in CMake. Convert slashes explicitly since we have no `find_library` call for `FREETYPE_LIBRARY`.
* | | | | | | | | | | | Merge topic 'autogen-qrc-file-name'Brad King2017-10-301-5/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a8bf0b2b Autogen: RCC: Append checksum suffix to wrapped file name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1422
| * | | | | | | | | | | Autogen: RCC: Append checksum suffix to wrapped file nameSebastian Holtermann2017-10-291-5/+15
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #17404
* | | | | | | | | | | Merge topic 'cpack-deb-0-so-version-support'Brad King2017-10-304-4/+14
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5784ab8f CPack/Deb: handle shlibs file generation when SOVERSION set to 0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1423
| * | | | | | | | | | | CPack/Deb: handle shlibs file generation when SOVERSION set to 0Domen Vrankar2017-10-284-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS did not auto generate shlibs control file when .so version of the library was set to 0. Fixes #17318
* | | | | | | | | | | | Merge topic 'cpack-rpm-dist-test-fix'Brad King2017-10-301-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ce00cae CPack/RPM: DIST-MONOLITHIC-type subtest fix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1424
| * | | | | | | | | | | CPack/RPM: DIST-MONOLITHIC-type subtest fixDomen Vrankar2017-10-301-0/+5
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test was failing in case dist macro contained a + symbol which is valid but must be escaped for using the string as a regex. Fixes #17328
* | | | | | | | | | | Merge topic 'fix-co-compile'Brad King2017-10-3016-87/+175
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 197b4e18 Merge branch 'backport-fix-co-compile' into fix-co-compile 992962c7 cmcmd: Restore support for running multiple lint tools a5197eea cmcmd: Convert lint handlers to file-static functions 1c075ffd cmcmd: Rename loop iteration variable for clarity Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1418
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'backport-fix-co-compile' into fix-co-compileBrad King2017-10-2716-87/+175
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve a logical conflict by replacing `cmArray{Begin,End}` from the their side with `cm::{cbegin,cend}` from our side.
| | * | | | | | | | | | cmcmd: Restore support for running multiple lint toolsBrad King2017-10-2715-61/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.10.0-rc1~115^2 (Clean up iwyu code to not be one big if statement, 2017-08-28) incorrectly changed the logic to run only one lint tool at a time. Restore support for running all tools specified on the command-line.
| | * | | | | | | | | | cmcmd: Convert lint handlers to file-static functionsBrad King2017-10-272-29/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These do not need to be declared in the header.
| | * | | | | | | | | | cmcmd: Rename loop iteration variable for clarityBrad King2017-10-271-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'autogen-static-library-cycles'Brad King2017-10-3010-17/+172
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a4db861 Autogen: Tests: Add test for STATIC_LIBRARY cycles 798e4f2f Autogen: Don't add STATIC_LIBRARY cycle targets to the _autogen dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1408
| * | | | | | | | | | | Autogen: Tests: Add test for STATIC_LIBRARY cyclesSebastian Holtermann2017-10-279-0/+89
| | | | | | | | | | | |
| * | | | | | | | | | | Autogen: Don't add STATIC_LIBRARY cycle targets to the _autogen dependenciesSebastian Holtermann2017-10-271-17/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a STATIC_LIBRARY cycle is detected we don't add any STATIC_LIBRARY target from the cycle to the `_autogen` target dependencies. Closes #17389
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2017-10-301-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2017-10-291-1/+1
| |_|_|_|/ / / / / / / |/| | | | | | | | | |
generated by cgit v0.12 at 2025-02-14 04:41:31 (GMT)