summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | | | | | Tests: fix failures with gnu mode clang on windowsZsolt Parragi2019-05-2412-12/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Root causes were: * Using incorrect conditions (assuming MSVC-like command line mode) * Trying to compile the MSVC STL in C++11 mode, when parts of it require C++14 or enabling MS extensions in clang. * Missing flush in a testcase using stdout in a dll and a main part with static crt
| * | | | | | | cmake: use correct stack size with gnu mode clang on windowsZsolt Parragi2019-05-231-0/+6
| | | | | | | |
| * | | | | | | clang: setup correct configuration in gnu modeZsolt Parragi2019-05-232-7/+123
| | | | | | | |
| * | | | | | | cmGlobalNinjaGenerator: use gnu compatible paths with clang in gnu modeZsolt Parragi2019-05-171-7/+14
| | | | | | | |
| * | | | | | | binutils: add the llvm-* variants to the tool lists.Zsolt Parragi2019-05-171-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows cmake to use the ar/ranlib/objdump/ld tools on windows without mingw installed. These tools are selected when clang is in GNU command line mode.
| * | | | | | | clang: introduce CMAKE_<lang>_COMPILER_FRONTEND_VARIANTZsolt Parragi2019-05-175-38/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable is set to GNU on Windows when clang.exe ar clang++.exe is used, and set to MSVC for clang-cl.exe. CMAKE_<lang>_SIMULATE_ID is set to MSVC in both cases, as clang defaults to -fms-compatibility for all command lines on windows.
* | | | | | | | Merge topic 'FindZLIB-names'Brad King2019-05-291-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ff3ab2ac9 FindZLIB: Add more zlib library names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3384
| * | | | | | | | FindZLIB: Add more zlib library namesAlexander Neumann2019-05-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Account for all names that can be generated by the upstream zlib build system. Issue: #18029
* | | | | | | | | Merge topic 'samu'Brad King2019-05-291-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a15595e4c9 Ninja: Consider 'samu' when looking for CMAKE_MAKE_PROGRAM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3380
| * | | | | | | | | Ninja: Consider 'samu' when looking for CMAKE_MAKE_PROGRAMMichael Forney2019-05-281-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `samurai` is an alternative implementation of ninja and is a drop-in replacement. `samu --version` reports the ninja version it is compatible with.
* | | | | | | | | Merge topic 'swift-wrapper'Brad King2019-05-291-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6baa80d1e3 Modules: correct linker wrapper flag for Swift Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3390
| * | | | | | | | | Modules: correct linker wrapper flag for SwiftSaleem Abdulrasool2019-05-281-1/+2
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was sitting locally but was missed in previous commits. This enables the use of `LINKER:` when building Swift code bases.
* | | | | | | | | Merge topic 'linker-preference'Brad King2019-05-291-0/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | abea06efdf Modules: setup `CMAKE_Swift_LINKER_PREFERENCE` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3373
| * | | | | | | | | Modules: setup `CMAKE_Swift_LINKER_PREFERENCE`Saleem Abdulrasool2019-05-241-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Swift's driver will invoke the C++ driver (`clang++`) to invoke the linker. Additionally, it will configure the command line to deal with the linkage runtime support object (`swiftrt.o` or `swiftrt.obj`) to be added at the right time (similar to C/C++). Since it indirects through `clang++` it will properly setup the linker invocation for C++ and C as well. This should permit the correct linker driver to be invoked in multi-language projects. Closes #19299
* | | | | | | | | | Merge topic 'findopenmp-new-dates'Brad King2019-05-291-0/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26f2b65fec FindOpenMP: Add 5.0 and VS19 spec dates Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3375
| * | | | | | | | | FindOpenMP: Add 5.0 and VS19 spec datesChristian Pfeiffer2019-05-241-0/+4
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19289
* | | | | | | | | CMake Nightly Date StampKitware Robot2019-05-291-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'flex'Brad King2019-05-281-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7754448f6 FindFLEX: fix example Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3379
| * | | | | | | | FindFLEX: fix exampleMarcin Ĺšlusarz2019-05-261-0/+1
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Binaries using flex must link with the detected library.
* | | | | | | | Merge branch 'release-3.14'Brad King2019-05-280-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'FindThreads-doc-c++' into release-3.14Brad King2019-05-281-3/+0
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3391
| * \ \ \ \ \ \ \ \ Merge branch 'FindBoost-contract-requires-compile-features' into release-3.14Brad King2019-05-241-0/+10
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3368
* | \ \ \ \ \ \ \ \ \ Merge topic 'FindThreads-doc-c++'Brad King2019-05-281-3/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a38b63c1bb FindThreads: Drop incorrect docs about usage with C++ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3391
| * | | | | | | | | | FindThreads: Drop incorrect docs about usage with C++Brad King2019-05-281-3/+0
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the sentence added by commit 5a5a1d90f0 (Help: FindThreads not needed with modern C++., 2019-01-09, v3.14.0-rc1~186^2) about not needing the module with modern C++. The module is often still needed. Fixes: #19297
* | | | | | | | | | Merge topic 'cmake_automoc_relaxed_mode_deprecation'Brad King2019-05-284-4/+24
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df6adb02c0 Autogen: Deprecation release notes for CMAKE_AUTOMOC_RELAXED_MODE 5bf07b9cfc Help: Mark CMAKE_AUTOMOC_RELAXED_MODE as deprecated b5ad572ac1 Autogen: Deprecation message for CMAKE_AUTOMOC_RELAXED_MODE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3381
| * | | | | | | | | | Autogen: Deprecation release notes for CMAKE_AUTOMOC_RELAXED_MODESebastian Holtermann2019-05-271-0/+5
| | | | | | | | | | |