summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Teach CROSSCOMPILING_EMULATOR to support argumentsMarek Antoniak2019-06-0312-16/+129
| | | | Fixes: #19321
* Merge topic 'doc-test-cost-default'Craig Scott2019-06-031-4/+10
|\ | | | | | | | | | | | | 774102aaec Help: Clarify the default value for test property COST Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3397
| * Help: Clarify the default value for test property COSTCraig Scott2019-06-021-4/+10
| | | | | | | | Co-Authored-By: Steve Mokris <smokris@softpixel.com>
* | Merge topic 'add_library_unknown'Craig Scott2019-06-031-0/+6
|\ \ | | | | | | | | | | | | | | | | | | 4127f82179 add_library: Document UNKNOWN type of imported targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3346
| * | add_library: Document UNKNOWN type of imported targetsCristian Adam2019-06-021-0/+6
| | |
* | | CMake Nightly Date StampKitware Robot2019-06-031-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2019-06-021-1/+1
|/ /
* | CMake Nightly Date StampKitware Robot2019-06-011-1/+1
| |
* | Merge topic 'vs-add-package-reference'Brad King2019-05-318-0/+95
|\ \ | | | | | | | | | | | | | | | | | | | | | 42e14d90b1 VS: Added support for VS package references for nuget Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Leonid Pospelov <pospelovlm@yandex.ru> Merge-request: !3389
| * | VS: Added support for VS package references for nugetKinan Mahdi2019-05-308-0/+95
| | |
* | | Merge branch 'release-3.14'Brad King2019-05-310-0/+0
|\ \ \
| * | | CMake 3.14.5v3.14.5Brad King2019-05-311-1/+1
| | | |
* | | | Merge topic 'ninja-cmcldeps'Brad King2019-05-311-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd28e24947 Windows-MSVC.cmake: fix disabling of CMAKE_NINJA_CMCLDEPS_RC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3404
| * | | | Windows-MSVC.cmake: fix disabling of CMAKE_NINJA_CMCLDEPS_RCMarc-André Moreau2019-05-301-1/+3
| | | | |
* | | | | Merge topic 'update-kwsys'Brad King2019-05-315-10/+52
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3a7f493b7b Merge branch 'upstream-KWSys' into update-kwsys 9ef1e13bcc KWSys 2019-05-30 (f892bacf) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3401
| * \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2019-05-305-10/+52
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2019-05-30 (f892bacf)
| | * | | | | KWSys 2019-05-30 (f892bacf)KWSys Upstream2019-05-305-10/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit f892bacf6c563b1f6fb843ffb623b434bc2ded4f (master). Upstream Shortlog ----------------- Zsolt Parragi (1): 887b1da5 Fixing issues when building with clang 8.0 on Windows
* | | | | | | Merge topic 'FindPython-remove-erroneous-code'Brad King2019-05-311-2/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a871d51a3 FindPython*: remove erroneous code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3400
| * | | | | | | FindPython*: remove erroneous codeMarc Chevrier2019-05-301-2/+0
| |/ / / / / /
* | | | | | | Merge branch 'release-3.14'Brad King2019-05-310-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge branch 'vs-depends-dedup' into release-3.14Brad King2019-05-302-20/+45
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3388
| * \ \ \ \ \ \ Merge branch 'implicit-includes-CPATH' into release-3.14Brad King2019-05-307-3/+96
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3395
* | \ \ \ \ \ \ \ Merge topic 'vs-depends-dedup'Brad King2019-05-312-20/+45
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 42bc67bd43 VS: De-duplicate custom command dependencies d03a6fc857 VS: Clarify name of custom commands AdditionalInputs variable fcedf8e552 VS: Isolate custom command input/output generation scopes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3388
| * | | | | | | | VS: De-duplicate custom command dependenciesFrans van Dorsselaer2019-05-301-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid listing the same input more than once in custom commands generated in `.vcxproj` and `.csproj` files. In the case of a `.vcxproj` file additionally avoid listing the source to which the command is attached since it is already implicitly a dependency. This is a nice cleanup and also works around a VS 2019 16.1 regression in MSBuild dependency checking. Starting with that version, MSBuild now re-builds custom commands when the list of dependencies has changed. However, its check is confused by duplicate dependencies. De-duplicating them avoids this problem. Co-Author: Brad King <brad.king@kitware.com> Fixes: #19303
| * | | | | | | | VS: Clarify name of custom commands AdditionalInputs variableFrans van Dorsselaer2019-05-302-9/+10
| | | | | | | | |
| * | | | | | | | VS: Isolate custom command input/output generation scopesBrad King2019-05-301-12/+16
| | | | | | | | |
* | | | | | | | | Merge topic 'implicit-includes-CPATH'Brad King2019-05-317-3/+96
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2d0b0e2b9d Do not exclude include directories made implicit by CPATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3395
| * | | | | | | | Do not exclude include directories made implicit by CPATHBrad King2019-05-307-3/+96
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Entries of the `CPATH` environment variable are implicitly searched as include directories by some C/C++ compilers. Since commit 5990ecb741 (Compute implicit include directories from compiler output, 2018-12-07, v3.14.0-rc1~108^2) these entries are detected by CMake and included in the `CMAKE_{C,CXX}_IMPLICIT_INCLUDE_DIRECTORIES` variables. However, we should not exclude them from explicit specification via `-I` or particularly `-isystem` because they are meant as user-specified include directories that can be re-ordered without breaking compiler builtin headers. In particular, we need explicit requests via `include_directories` with the `SYSTEM` option to result in `-isystem` so that third-party headers do not produce warnings. Co-Author: Ben Boeckel <ben.boeckel@kitware.com> Fixes: #19291
* | | | | | | | CMake Nightly Date StampKitware Robot2019-05-311-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'update-vim-syntax'Brad King2019-05-303-52/+848
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b410dd5a05 Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntax 06434fc274 vim-cmake-syntax 2019-05-29 (c42ede9f) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3394
| * | | | | | | Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntaxPatrick Boettcher2019-05-293-52/+848
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | * upstream-vim-cmake-syntax: vim-cmake-syntax 2019-05-29 (c42ede9f)
| | * | | | | | vim-cmake-syntax 2019-05-29 (c42ede9f)vim-cmake-syntax upstream2019-05-293-50/+859
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/pboettch/vim-cmake-syntax.git at commit c42ede9f70e53a69f98e5bc5df16f834937dd37c (master). Upstream Shortlog ----------------- Patrick Boettcher (6): 4e657a05 update to cmake version 3.13.20181220-g0495c b0ada6e2 add <LANG>-replacing in variables. 60654a65 Update keywords for version 3.14.20190402-g56ae2 33e512bd format brace-encapsulated variables (varname from var) a3628ebb fix keywords of generator-expressions wrongly colored in simple arguments c42ede9f update to cmake version 3.14.20190529-g067a4f
* | | | | | | | Merge topic 'FindBoost-debug-messages'Brad King2019-05-301-100/+100
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35bfc85d95 FindBoost: Refactor debug messages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3382
| * | | | | | | | FindBoost: Refactor debug messagesDennis Klein2019-05-281-100/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Deduplicate code with helper functions * Remove double printing of _boost_TEST_VERSIONS * Fix #19158 * Add printing of a few additional variables
* | | | | | | | | Merge topic 'doc-mr-resolve-states'Brad King2019-05-301-7/+68
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 49f5b6f7bf Help: Document the expire and external discussion resolve states Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !3377
| * | | | | | | | | Help: Document the expire and external discussion resolve statesCraig Scott2019-05-301-7/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our practice of closing MRs temporarily while discussion takes place in a separate issue isn't always well understood by MR authors. Expiring a MR seems to be better understood, but making it clear that it is also a temporary state is helpful.
* | | | | | | | | | Merge topic 'fix-clang-warnings'Brad King2019-05-304-16/+32
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4fe34b2d29 Fixing warnings generated by clang 8.0 on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3396
| * | | | | | | | | | Fixing warnings generated by clang 8.0 on WindowsZsolt Parragi2019-05-294-16/+32
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Deprecation removals previously specific to MSVC/Intel now also used by clang * String literals were assigned to non const pointers. These are stored in mutable arrays now * An implicit function pointer to pointer conversion is a Microsoft extension warning is suppressed by an explicit reinterpret_cast * The MSVC specific deprecation macro for jsoncpp was moved after the clang macro to avoid redefinition warnings. This is consistent with how jsoncpp fixed the issue in 36d8cfd7
* | | | | | | | | | Merge topic 'string-tar'Brad King2019-05-304-15/+15
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 57cedb18c0 cmSystemTools: std::string parameters for tar functions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3392
| * | | | | | | | | | cmSystemTools: std::string parameters for tar functionsVitaly Stakhovsky2019-05-294-15/+15
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'ninja_rule_class'Brad King2019-05-305-286/+221
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6136ab5e17 Ninja: Use cmNinjaRule as sole parameter in the WriteRule and AddRule methods 6a23fbce47 Ninja: Add cmNinjaRule class Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3393
| * | | | | | | | | | | Ninja: Use cmNinjaRule as sole parameter in the WriteRule and AddRule methodsSebastian Holtermann2019-05-294-286/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of passing multiple strings to the `WriteRule` and `AddRule` methods of `cmGlobalNinjaGenerator`, pass only a `cmNinjaRule` instance reference, that is set up beforehand. Adapt calls to `WriteRule` and `AddRule` in multiple places.
| * | | | | | | | | | | Ninja: Add cmNinjaRule classSebastian Holtermann2019-05-291-0/+21
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge topic 'tar-zstd-compression'Brad King2019-05-309-9/+45
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53cb1f2d04 cmake: Teach cmake -E tar command, Zstandard compression Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3357
| * | | | | | | | | | cmake: Teach cmake -E tar command, Zstandard compressionBartosz Kosiorek2019-05-229-9/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #18657
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2019-05-301-1/+1
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge topic 'clang-gnulike-support'Brad King2019-05-2939-102/+265
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 74829f01b1 Help: Add notes for topic 'clang-gnulike-support' 19669abe1d Tests: handle string escaping differences with NMake+clang a2a90f41e3 Tests: require C++14 for the Tutorial 4819ff9647 Tests: fix failures with gnu mode clang on windows 26af0b25e7 cmake: use correct stack size with gnu mode clang on windows d44c0db0b2 clang: setup correct configuration in gnu mode b7d5ef23e9 cmGlobalNinjaGenerator: use gnu compatible paths with clang in gnu mode 3d0210d8dc binutils: add the llvm-* variants to the tool lists. ... Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Francesco Bertolaccini <francesco@bertolaccini.dev> Acked-by: Stanislav Ershov <digital.stream.of.mind@gmail.com> Acked-by: Saleem Abdulrasool <compnerd@compnerd.org> Merge-request: !2992
| * | | | | | | | | | Help: Add notes for topic 'clang-gnulike-support'Brad King2019-05-241-0/+5
| | | | | | | | | | |
| * | | | | | | | | | Tests: handle string escaping differences with NMake+clangZsolt Parragi2019-05-243-6/+13
| | | | | | | | | | |
| * | | | | | | | | | Tests: require C++14 for the TutorialZsolt Parragi2019-05-2413-27/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang++ on Windows with the MSVC STL requires C++14 to compile. The C++ standard is set to C++14 for the entire tutorial instead of MSVC/clang specific conditions to keep it simple.