summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'doc-vs-generator-clarify-project-types'Brad King2018-08-095-0/+30
|\ | | | | | | | | | | | | a82eb539f0 Help: Describe the type of Visual Studio projects that can be generated Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2262
| * Help: Describe the type of Visual Studio projects that can be generatedJean-Christophe Fillion-Robin2018-08-095-0/+30
| | | | | | | | | | Issue: #17956 See-also: https://stackoverflow.com/questions/51647437/use-cmake-to-generate-visual-studio-python-projects/51666488
* | Merge branch 'release-3.12'Brad King2018-08-090-0/+0
|\ \
| * | CMake 3.12.1v3.12.1Brad King2018-08-091-1/+1
| | |
* | | Merge topic 'document_cache_variable_checking'Brad King2018-08-097-3/+40
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4d384d290e Help: Document the $CACHE{} syntax Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2269
| * | | Help: Document the $CACHE{} syntaxRobert Maynard2018-08-077-3/+40
| | | | | | | | | | | | | | | | Also add a test case for the behavior.
* | | | Merge topic 'cleanup-find-cstr'Brad King2018-08-0919-43/+42
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 69ca85cc7f Remove unnecessary c_str() in RegularExpression::find calls Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2271
| * | | | Remove unnecessary c_str() in RegularExpression::find callsVitaly Stakhovsky2018-08-0719-43/+42
| | | | |
* | | | | Merge topic 'cmGeneratedFileStream_string'Brad King2018-08-0938-111/+106
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b6802cd506 cmGeneratedFileStream: clang-tidy applied to remove redundant ``c_str`` calls a688defcc6 cmGeneratedFileStream: Use ``std::string const&`` instead of ``const char*`` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2266
| * | | | | cmGeneratedFileStream: clang-tidy applied to remove redundant ``c_str`` callsSebastian Holtermann2018-08-0737-93/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After changing the ``cmGeneratedFileStream`` methods to accept ``std::string const&`` instead of ``const char*`` we don't need to call ``std::string::c_str`` anymore when passing a ``std::string`` to a ``cmGeneratedFileStream`` method. This patch removes all redundant ``std::string::c_str`` calls when passing a string to a ``cmGeneratedFileStream`` method. It was generated by building CMake with clang-tidy enabled using the following options: -DCMAKE_CXX_CLANG_TIDY=/usr/bin/clang-tidy-4.0;-checks=-*,readability-redundant-string-cstr;-fix;-fix-errors
| * | | | | cmGeneratedFileStream: Use ``std::string const&`` instead of ``const char*``Sebastian Holtermann2018-08-072-18/+19
| |/ / / /
* | | | | Merge topic 'intel-windows-xilib'Brad King2018-08-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ef6a08f6f7 Intel: Use xilib as librarian on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Christian Pfeiffer <cpfeiffer@live.de> Merge-request: !2265
| * | | | | Intel: Use xilib as librarian on WindowsyrHeTaTeJlb2018-08-071-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We already use `xilink` instead of `link`, so use `xilib` instead of lib too. Suggested-by: Christian Pfeiffer <cpfeiffer@live.de> Issue: #18240
* | | | | Merge topic 'update-liblzma'Brad King2018-08-09112-2187/+4206
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e9c1d0c87 CTestCustom: Suppress scanbuild warning in liblzma 2461dd79e5 liblzma: Suppress MSVC warning parameter difference warning 9f77124ea8 liblzma: Drop checks for inline and restrict keywords 7a976ee742 Merge branch 'upstream-liblzma' into update-liblzma 352b8fa70d liblzma 2018-04-29 (b5be61cc) 021b54cab8 liblzma: Revise update script to get version 5.2.4 6b494f567a Merge branch 'upstream-liblzma' into update-liblzma 897b790d57 liblzma 2014-12-21 (265e5ffb) ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2264
| * | | | | CTestCustom: Suppress scanbuild warning in liblzmaBrad King2018-08-071-0/+1
| | | | | |
| * | | | | liblzma: Suppress MSVC warning parameter difference warningBrad King2018-08-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some `.c` sources add `restrict` to their pointer types to tell the optimizer that there is no aliasing. These do not appear in the corresponding `.h` declarations so MSVC warns.
| * | | | | liblzma: Drop checks for inline and restrict keywordsBrad King2018-08-062-40/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now require the compiler to support these, except for MSVC where upstream liblzma already has special cases (in `common/sysdefs.h`).
| * | | | | Merge branch 'upstream-liblzma' into update-liblzmaBrad King2018-08-0696-1047/+3477
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-liblzma: liblzma 2018-04-29 (b5be61cc)
| | * | | | | liblzma 2018-04-29 (b5be61cc)liblzma upstream2018-08-0697-1050/+3478
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://git.tukaani.org/xz.git at commit b5be61cc06088bb07f488f9baf7d447ff47b37c1 (v5.2.4).
| * | | | | | liblzma: Revise update script to get version 5.2.4Brad King2018-08-061-1/+3
| | | | | | |
| * | | | | | Merge branch 'upstream-liblzma' into update-liblzmaBrad King2018-08-060-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * upstream-liblzma: liblzma 2014-12-21 (265e5ffb)
| | * | | | | liblzma 2014-12-21 (265e5ffb)liblzma upstream2018-08-069-407/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://git.tukaani.org/xz.git at commit 265e5ffb70d9c175b424621576294d28807efd9b (v5.0.8).
| * | | | | | liblzma: Avoid importing upstream makefilesBrad King2018-08-061-1/+3
| | | | | | |
| * | | | | | liblzma: Name sizeof size_t macro consistently with upstreamBrad King2018-08-063-4/+4
| | | | | | |
| * | | | | | liblzma: Revert "Port from C99 to C89/90"Brad King2018-08-0661-1075/+700
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.1.0-rc1~255^2~5 (liblzma: Port from C99 to C89/90, 2014-07-13). We now compile as C99 or above except on MSVC where we will use another approach.
| * | | | | | liblzma: Revert "Avoid defining a 'restrict' macro"Brad King2018-08-0631-103/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.1.0-rc1~255^2~2 (liblzma: Avoid defining a 'restrict' macro, 2014-07-24). We will use another approach to deal with the 'restrict' keyword.
* | | | | | | Merge topic 'update-kwsys'Brad King2018-08-091-3/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ba872ea9c3 Merge branch 'upstream-KWSys' into update-kwsys 4d76239a51 KWSys 2018-08-07 (9044518f) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2268
| * \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-08-071-3/+21
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-08-07 (9044518f)
| | * | | | | | | KWSys 2018-08-07 (9044518f)KWSys Upstream2018-08-071-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 9044518f428b84da70f1e02d09b7cd4c35366831 (master). Upstream Shortlog ----------------- Jon Chronopoulos (1): 55a29eba SystemTools: Allow FileExists on Windows to follow symlinks
* | | | | | | | | Merge topic 'iwyu-std-hash'Brad King2018-08-094-6/+5
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aefb8559dc IWYU: Fix workaround mapping for std::hash Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2267
| * | | | | | | | | IWYU: Fix workaround mapping for std::hashBrad King2018-08-074-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is provided by `functional`, not `utility`. Fix the mapping added by commit 276d3c7afe (IWYU: Add workaround mapping for std::hash, 2018-07-31). Also generalize the workaround from commit v3.12.0-rc1~39^2~1 (IWYU: Define a macro to tell code it is preprocessing for iwyu, 2018-05-25) to allow local builds to configure specific flags. This is needed because iwyu behaves differently in different environments.
* | | | | | | | | | CMake Nightly Date StampKitware Robot2018-08-091-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2018-08-081-1/+1
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge topic 'productbuild-merge-output'Craig Scott2018-08-071-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 496d22b8cc productbuild: Capture stderr too in CPackProductBuild logs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2257
| * | | | | | | | | productbuild: Capture stderr too in CPackProductBuild logsMuhammad Ismail Soboute2018-08-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stdout and stderr will be merged. Fixes: #18234
* | | | | | | | | | Merge topic 'xerces-version-fix'Brad King2018-08-071-4/+4
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00a5836a3d FindXercesC: Correct order of version detection and versioned library checks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2259
| * | | | | | | | | FindXercesC: Correct order of version detection and versioned library checksRoger Leigh2018-08-031-4/+4
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2018-08-071-1/+1
| |_|_|/ / / / / / |/| | | | | | | |
* | | | | | | | | Merge topic 'update_maintainer_edit_label'Brad King2018-08-061-1/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 670324bea2 Help: Update maintainer edit checkbox label Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2263
| * | | | | | | | | Help: Update maintainer edit checkbox labelCraig Scott2018-08-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent GitLab updates have changed the label associated with the checkbox in merge request descriptions for allowing edits from maintainers. Make the contributor guidelines match the new label and add a note for why it is recommended.
* | | | | | | | | | Merge topic 'autogen_single_entry'Brad King2018-08-062-28/+28
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87e7904c91 Autogen: Use a single AUTOGEN setup function in cmGlobalGenerator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2260
| * | | | | | | | | Autogen: Use a single AUTOGEN setup function in cmGlobalGeneratorSebastian Holtermann2018-08-032-28/+28
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By moving all AUTOGEN setup code in ``cmGlobalGenerator`` into a single ``cmGlobalGenerator::QtAutoGen`` function, the ``cmGlobalGenerator::Compute`` function becomes cleaner.
* | | | | | | | | Merge topic 'xcode_schemes_config'Brad King2018-08-0645-0/+738
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b7f1e1db0 Xcode: Add variables and properties to configure schemes 39c91d0703 cmGlobalGenerator: Add IsXcode query Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1803
| * | | | | | | | | Xcode: Add variables and properties to configure schemesGregor Jasny2018-08-0143-0/+734
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `XCODE_SCHEME_*` target properties and associated variables `CMAKE_XCODE_SCHEME_*` to initialize them on target creation. Map each target property value to an associated Xcode scheme entry. Co-Author: Martin Sander <mail@martin-sander.de> Fixes: #17919
| * | | | | | | | | cmGlobalGenerator: Add IsXcode queryBrad King2018-08-012-0/+4
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Make it easy to detect use of the Xcode generator.
* | | | | | | | | Merge topic 'nag-fortran-rsp'Brad King2018-08-061-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10d6c3a635 NAG: Pass response files through front-end to the linker Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2250
| * | | | | | | | | NAG: Pass response files through front-end to the linkerBrad King2018-08-011-0/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `nagfor` compiler front-end does not support the `@rspfile` syntax. Use `-Wl,@rspfile` instead to pass it through to the linker. Fixes: #18232
* | | | | | | | | Merge topic 'xl-exe-pic'Brad King2018-08-061-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c2856e0b2b XL: Use -qpic for position independent executables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2249
| * | | | | | | | | XL: Use -qpic for position independent executablesBrad King2018-08-011-0/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The XL compiler does not have a dedicated "pie" option so use at least `-qpic`. This missing setting was exposed by the `ExportImport` and `PositionIndependentTargets` tests with XL on an ELF platform.
* | | | | | | | | Merge topic 'FindMatlab-mcc'Brad King2018-08-062-1/+27
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f34f6eb3d1 FindMatlab: Add component to find MCC, the Matlab compiler Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2233
generated by cgit v0.12 at 2025-01-19 23:27:11 (GMT)