summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'lexer-null'Brad King2018-06-296-103/+106
|\ | | | | | | | | | | | | b29842a818 ListFileLexer: Do not match null bytes in input Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2174
| * ListFileLexer: Do not match null bytes in inputBrad King2018-06-266-103/+106
| | | | | | | | | | | | | | | | | | | | | | Extend the fix from commit v3.10.0-rc1~188^2 (ListFileLexer: fix heap-buffer-overflow on malicious input, 2017-08-26) to apply to all lexer token matches. Replace all `.` with `[^\0\n]`. Update all `[^...]` match expressions to not match `\0`. We cannot safely process null bytes in strings. Fixes: #18124
* | Merge topic 'FindMatlab-doc-mcr'Brad King2018-06-291-0/+3
|\ \ | | | | | | | | | | | | | | | | | | 27ae8d52d0 Help: Add 3.12 release note for FindMatlab MCR support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2173
| * | Help: Add 3.12 release note for FindMatlab MCR supportBrad King2018-06-261-0/+3
| |/ | | | | | | | | This release note was forgotten by commit v3.12.0-rc1~183^2 (FindMatlab: Matlab Runtime Compiler support, 2018-04-29).
* | CMake Nightly Date StampKitware Robot2018-06-291-1/+1
| |
* | CMake Nightly Date StampKitware Robot2018-06-281-1/+1
| |
* | CMake Nightly Date StampKitware Robot2018-06-271-1/+1
| |
* | CMake Nightly Date StampKitware Robot2018-06-261-1/+1
| |
* | Merge branch 'release-3.12'Brad King2018-06-250-0/+0
|\ \
| * \ Merge branch 'libuv-new-version-file-location' into release-3.12Brad King2018-06-251-0/+2
| |\ \ | | | | | | | | | | | | Merge-request: !2169
* | \ \ Merge topic 'libuv-new-version-file-location'Brad King2018-06-251-0/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 889033b5c6 FindLibUV: Also check uv/version.h for version detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2169
| * | | FindLibUV: Also check uv/version.h for version detectionRaphael Kubo da Costa2018-06-251-0/+2
| | |/ | |/| | | | | | | | | | Starting with libuv 1.21.0, libuv's headers were moved into a uv/ directory. Make FindLibUV aware of the file's new location for configuration to work.
* | | Merge topic 'update-kwsys'Brad King2018-06-259-41/+33
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b41b30f16e Update use of KWSys SystemTools::SplitString for new signature f2d97c1cdf Merge branch 'upstream-KWSys' into update-kwsys 6d7fdedde6 KWSys 2018-06-22 (49068d94) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2165
| * | | Update use of KWSys SystemTools::SplitString for new signatureBrad King2018-06-227-26/+21
| | | |
| * | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-06-222-15/+12
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-06-22 (49068d94)
| | * | | KWSys 2018-06-22 (49068d94)KWSys Upstream2018-06-222-15/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 49068d948ee03cde172fe5ff15a2778c50f91d38 (master). Upstream Shortlog ----------------- Brad King (1): 5d6f59fe SystemTools: Change SplitString return type to use std::string
* | | | | Merge topic 'test-wizard'Brad King2018-06-254-4/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7bffd71c3b Tests: Adopt wizard test in RunCMake.CommandLine Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2166
| * | | | | Tests: Adopt wizard test in RunCMake.CommandLineBrad King2018-06-224-4/+3
| |/ / / / | | | | | | | | | | | | | | | Avoid a whole separate test for one removed command-line option.
* | | | | Merge branch 'release-3.12'Brad King2018-06-250-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'vs-filter-default-toolset' into release-3.12Brad King2018-06-256-27/+73
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2162
| * \ \ \ \ Merge branch 'file-GLOB-remove-new-errors' into release-3.12Brad King2018-06-227-28/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2164
* | \ \ \ \ \ Merge topic 'vs-filter-default-toolset'Brad King2018-06-256-27/+73
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c4698da3a VS: Allow toolset version selection to specify default toolset b759f7068f cmVSSetupHelper: Expose default toolset version d548994afc cmVSSetupHelper: Use in-class member initialization Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2162
| * | | | | | VS: Allow toolset version selection to specify default toolsetBasil Fierz2018-06-244-18/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the feature added by commit v3.12.0-rc1~38^2 (VS: Add option to select the version of the toolset used by VS 2017, 2018-05-19) to accept the default toolset version in addition to older versions. If the default toolset version is supplied, simply clear it so the default will be used. Fixes: #18107
| * | | | | | cmVSSetupHelper: Expose default toolset versionBasil Fierz2018-06-222-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We already detect the VS toolset version. Expose it to clients.
| * | | | | | cmVSSetupHelper: Use in-class member initializationBrad King2018-06-221-9/+4
| | |_|_|_|/ | |/| | | |
* | | | | | Merge topic 'file-GLOB-remove-new-errors'Brad King2018-06-257-28/+12
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 142a625729 file: Drop error cases added by CMake 3.12.0-rc1 to avoid regressions Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Shane Parris <shane.lee.parris@gmail.com> Merge-request: !2164
| * | | | | file: Drop error cases added by CMake 3.12.0-rc1 to avoid regressionsBrad King2018-06-227-28/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.12.0-rc1~418^2~3 (Refactor HandleGlobCommand, 2018-02-13) introduced error diagnostics for argument combinations that were previously accepted. Restore acceptance to avoid regressing projects that used those combinations even if they do not make sense. Fixes: #18097
* | | | | CMake Nightly Date StampKitware Robot2018-06-251-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-06-241-1/+1
| | | | |
* | | | | Merge topic 'cmake-buildsystem-manual-typo'Craig Scott2018-06-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82956270ed Help: Fix typo in cmake-buildsystem(7) manual Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2163
| * | | | | Help: Fix typo in cmake-buildsystem(7) manualJoan Massich2018-06-221-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-06-231-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'cpack-generator-documentation'Brad King2018-06-2268-3528/+3561
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 57e4c51e8a Help: Update old version release notes for CPack generator docs 4181830881 Help: Add release notes for CPack generator documentation and module updates 48bc8b2b82 CPack: Move internal implementation modules into Internal/CPack directory 2a2829cc75 Help: Add new section for CPack generators be6267808a CPackIFW: Turn documentation into a block comment 0180524c7a Help: Move legacy CPack modules into separate section Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2149
| * | | | | Help: Update old version release notes for CPack generator docsBrad King2018-06-2112-108/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace references to the CPack "modules" with proper terminology referencing the CPack generator documentation directly.
| * | | | | Help: Add release notes for CPack generator documentation and module updatesKyle Edwards2018-06-211-0/+9
| | | | | |
| * | | | | CPack: Move internal implementation modules into Internal/CPack directoryKyle Edwards2018-06-2122-2724/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These modules are not meant to be included by user code, they are only an internal implementation detail for CPack. Having them live in the main Modules directory with documentation was misleading, so they have been moved into Modules/Internal/CPack, and their documentation has been stripped following its move into the new "CPack Generators" section. No-op modules which contained only documentation have been removed entirely. The only module that hasn't been moved is CPackIFW, because it contains user-facing macros which would be lost if it were moved. So, the CPackIFW module has been updated with a note explaining what needs to (eventually) happen.
| * | | | | Help: Add new section for CPack generatorsKyle Edwards2018-06-2133-371/+2961
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The documentation for CPack generators previously lived in their respective internal CMake modules. This setup was misleading, because it implied that you should include the modules in your own code, which is not the case. Moving the documentation into a separate section does a better job of hiding the internal modules, which are just an implementation detail. The generator documentation has also been modified to remove any references to the module name. The CPackIFW module is a special exception: since it has user-facing macros, the documentation for these macros has been kept in the module page, while all other documentation related to the IFW generator has been moved into the new section. To make it easier to find the new documentation, the old help pages for the CPack*.cmake modules have not been deleted, but have been replaced with a link to their respective help page in the new documentation section.
| * | | | | CPackIFW: Turn documentation into a block commentKyle Edwards2018-06-211-671/+672
| | | | | |
| * | | | | Help: Move legacy CPack modules into separate sectionKyle Edwards2018-06-211-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These modules are being moved out of user visibility and into an internal section of CMake. To keep them for historical reference in the manual, this commit moves them into a separate "Legacy CPack Modules" section.
* | | | | | Merge topic 'cmake_autogen_verbose'Brad King2018-06-2214-8/+69
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b85ef5cd0 Autogen: Add release notes for CMAKE_AUTOGEN_VERBOSE 6651aab2ab Autogen: Add documentation for CMAKE_AUTOGEN_VERBOSE aa7d8a092c Autogen: Enable CMAKE_AUTOGEN_VERBOSE in all tests e28dc3b1d8 Autogen: Add CMAKE_AUTOGEN_VERBOSE variable support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2157
| * | | | | | Autogen: Add release notes for CMAKE_AUTOGEN_VERBOSESebastian Holtermann2018-06-211-0/+6
| | | | | | |
| * | | | | | Autogen: Add documentation for CMAKE_AUTOGEN_VERBOSESebastian Holtermann2018-06-212-0/+14
| | | | | | |
| * | | | | | Autogen: Enable CMAKE_AUTOGEN_VERBOSE in all testsSebastian Holtermann2018-06-215-0/+5
| | | | | | |
| * | | | | | Autogen: Add CMAKE_AUTOGEN_VERBOSE variable supportSebastian Holtermann2018-06-216-8/+44
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Setting CMAKE_AUTOGEN_VERBOSE enables verbose output during AUTOMOC, AUTOUIC and AUTORCC generation.
* | | | | | Merge topic 'vs_debugger'Brad King2018-06-2216-7/+142
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 797de7a6f6 VS10Project: Expand VS_DEBUGGER_* capabilities Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2150
| * | | | | | VS10Project: Expand VS_DEBUGGER_* capabilitiesJon Chronopoulos2018-06-1716-7/+142
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds VS_DEBUGGER_COMMAND_ARGUMENTS and VS_DEBUGGER_ENVIRONMENT as well as allowing VS_DEBUGGER_* to use generator expressions.
* | | | | | | Merge branch 'release-3.12'Brad King2018-06-220-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'FindJPEG-fix-debug' into release-3.12Brad King2018-06-211-7/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2159
* | \ \ \ \ \ \ Merge topic 'FindJPEG-fix-debug'Brad King2018-06-221-7/+1
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | / / / | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | ae4a548302 FindJPEG: Drop ancient compatibility NATIVE_JPEG_* result variables 7876f329a9 FindJPEG: Add forgotten names of libraries for Debug configuration Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2159
| * | | | | | FindJPEG: Drop ancient compatibility NATIVE_JPEG_* result variablesAndrey Karpov2018-06-211-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These have been deprecated since 2002!
generated by cgit v0.12 at 2025-01-24 05:37:00 (GMT)