summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* cmArchiveWrite: support setting archive filter optionsBen Boeckel2020-03-312-0/+16
|
* cmArchiveWrite: split out opening the fileBen Boeckel2020-03-315-1/+18
| | | | | This allows options to be set before the "header" phase of libarchive's API.
* Merge topic 'cmake-gui-open-check'Brad King2020-03-231-1/+1
|\ | | | | | | | | | | | | ecc0086bfc cmake-gui: Fix use-after-free in Open-possible check Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4508
| * cmake-gui: Fix use-after-free in Open-possible checkFrancisco Facioni2020-03-201-1/+1
| | | | | | | | | | Fix `QCMake::checkOpenPossible` to copy `toLocal8Bit().data()` before its lifetime expires.
| * CMake 3.17.0v3.17.0Brad King2020-03-201-1/+1
| |
| * Merge topic 'export-repeat' into release-3.17Brad King2020-03-205-28/+33
| |\ | | | | | | | | | | | | | | | | | | 8affe9aa33 export: Fix use-after-free on multiple calls overwriting same FILE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4494
* | | CMake Nightly Date StampKitware Robot2020-03-231-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2020-03-221-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2020-03-211-1/+1
| | |
* | | Merge topic 'export-repeat'Brad King2020-03-205-28/+33
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 8affe9aa33 export: Fix use-after-free on multiple calls overwriting same FILE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4494
| * | export: Fix use-after-free on multiple calls overwriting same FILEBrad King2020-03-195-28/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake 3.16 and below allow multiple `export()` calls with the same output file even without using `APPEND`. The implementation worked by accident by leaking memory. Refactoring in commit 5444a8095d (cmGlobalGenerator: modernize memrory managemenbt, 2019-12-29, v3.17.0-rc1~239^2) cleaned up that memory leak and converted it to a use-after-free instead. The problem is caused by using the `cmGlobalGenerator::BuildExportSets` map to own `cmExportBuildFileGenerator` instances. It can own only one instance per output FILE name at a time, so repeating use of the same file now frees the old `cmExportBuildFileGenerator` instance and leaves the pointer in the `cmMakefile::ExportBuildFileGenerators` vector dangling. Move ownership of the instances into `cmMakefile`'s vector since its entries are not replaced on a repeat output FILE. In future work we should introduce a policy to error out on this case. For now simply fix the use-after-free to restore CMake <= 3.16 behavior. Fixes: #20469
* | | CMake Nightly Date StampKitware Robot2020-03-201-1/+1
| | |
* | | Merge topic 'cmprop-state'Brad King2020-03-1915-76/+74
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bd89133543 cmState::GetCacheEntryValue: return cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4493
| * | | cmState::GetCacheEntryValue: return cmPropVitaly Stakhovsky2020-03-1715-76/+74
| | | |
* | | | Merge topic 'target-improve'Brad King2020-03-195-30/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b915fec56e cmTarget: minor code improvements Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4483
| * | | | cmTarget: minor code improvementsVitaly Stakhovsky2020-03-175-30/+30
| |/ / /
* | | | Merge topic 'trace-format-json-doc'Brad King2020-03-191-1/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 1994f950ff cmake: List valid values for --trace-format on the command line e39766d84a Help: Fix documentation of --trace-format parameter Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4500
| * | | cmake: List valid values for --trace-format on the command lineKyle Edwards2020-03-181-1/+2
| | |/ | |/|
| * | CMake 3.17.0-rc3v3.17.0-rc3Brad King2020-03-121-1/+1
| | |
| * | Merge topic 'swift-link-line-spaces' into release-3.17Brad King2020-03-121-3/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | af39d1b993 Swift: Fix quoting of library search paths with spaces Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4469
| * \ \ Merge topic 'ctest-curl-debugfunction' into release-3.17Brad King2020-03-122-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a1cce210b CTest: Fix our internal CURL_DEBUGFUNCTION to conform to CURL docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4459
| * \ \ \ Merge topic 'rename-macho-version-properties' into release-3.17Craig Scott2020-03-122-5/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 14732d3f30 macOS: Rename OSX_*_VERSION properties to MACHO_*_VERSION Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4452
* | | | | | CMake Nightly Date StampKitware Robot2020-03-191-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2020-03-181-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'file-archive'Brad King2020-03-171-0/+208
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c7e1198a23 file: Add ARCHIVE_{CREATE|EXTRACT} subcommands Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4475
| * | | | | file: Add ARCHIVE_{CREATE|EXTRACT} subcommandsCristian Adam2020-03-161-0/+208
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20443
* | | | | | Merge topic 'property-computer'Brad King2020-03-173-19/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fad0ee5404 cmTargetPropertyComputer::GetProperty: return cmProp Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4482
| * | | | | | cmTargetPropertyComputer::GetProperty: return cmPropVitaly Stakhovsky2020-03-163-19/+23
| | | | | | |
* | | | | | | Merge topic 'prop_t'Brad King2020-03-1712-28/+35
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 60f57d0dcc cmPropertyMap: Introduce cmProp as return type for GetProperty() functions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4471
| * | | | | | | cmPropertyMap: Introduce cmProp as return type for GetProperty() functionsVitaly Stakhovsky2020-03-1312-28/+35
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently properties are usually stored internally as `std::string`. However, family of GetProperty() functions return them as `const char *` using `c_str()`. The proposed `cmProp`, typedef'ed as `const std::string *` will expose properties more naturally.
* | | | | | | Merge topic 'mf_profiling_json'Brad King2020-03-171-7/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 897af4c266 cmMakefileProfilingData: Fix ambiguous conversion to Json::Value Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4479
| * | | | | | | cmMakefileProfilingData: Fix ambiguous conversion to Json::ValueRaul Tambre2020-03-161-7/+8
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-03-171-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge topic 'define-property'Brad King2020-03-168-39/+35
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 73d52a862b cmPropertyDefinition: Construct directly in defined state Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4470
| * | | | | | | cmPropertyDefinition: Construct directly in defined stateVitaly Stakhovsky2020-03-138-39/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move `cmPropertyDefinitionMap::DefineProperty` functionality directly into the constructor to avoid an intermediate state.
* | | | | | | | Merge topic 'remove_trailing_whitespace'Brad King2020-03-161-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67a592583d Source: Remove trailing whitespace from export generation code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4474
| * | | | | | | Source: Remove trailing whitespace from export generation codeAlexandru Croitor2020-03-131-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-03-161-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-03-151-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-03-141-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge topic 'swift-implicit-module-include-dir'Brad King2020-03-131-0/+84
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2026915f8f Swift: Propagate Swift_MODULE_DIRECTORY as include directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4320
| * | | | | | | Swift: Propagate Swift_MODULE_DIRECTORY as include directorySaleem Abdulrasool2020-03-121-0/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach include directory computation for Swift to implicitly propagate the `Swift_MODULE_DIRECTORY` of all linked targets as include directories. This is required to ensure that the swiftmodule of a linked target is accessible to the compiler of the current target. Fixes: #19272
* | | | | | | | Merge topic 'profiling'Brad King2020-03-137-2/+232
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9aa4640792 cmake: add command line options to output script profiling data Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Acked-by: Pavel Solodovnikov <hellyeahdominate@gmail.com> Acked-by: Leonid Pospelov <pospelovlm@yandex.ru> Acked-by: Cristian Adam <cristian.adam@gmail.com> Merge-request: !2760
| * | | | | | | cmake: add command line options to output script profiling dataWouter Klouwen2020-03-077-2/+232
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For users of CMake who want to optimize their scripts if they take a while to run, this commit adds the ability to output profiling data. To enable this output, it adds the two command line parameters to select the output path and format. This commit adds the first profiling format of type ``google-trace``, which is the output is a JSON file containing Duration events as per the Google Trace Format specification: https://docs.google.com/document/d/1CvAClvFfyA5R- PhYUmn5OOQtYMH4h6I0nSsKchNAySU/preview#
* | | | | | | | CMake Nightly Date StampKitware Robot2020-03-131-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge topic 'swift-link-line-spaces'Brad King2020-03-121-3/+5
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | / | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | af39d1b993 Swift: Fix quoting of library search paths with spaces Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4469
| * | | | | Swift: Fix quoting of library search paths with spacesSaleem Abdulrasool2020-03-121-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The library search paths added by commit 2746c61e6d (Swift: Add library search paths for dependencies, 2019-06-09, v3.16.0-rc1~561^2) need to be quoted properly on command lines to handle spaces and such. This was already done by `cmLinkLineComputer::ComputeLinkPath` for non-Swift-specific link directories.
| * | | | | CMake 3.16.5v3.16.5Brad King2020-03-041-1/+1
| | | | | |
| * | | | | Merge branch 'backport-cuda-non-device-link' into release-3.16Brad King2020-02-241-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !4376
| * \ \ \ \ \ Merge branch 'backport-3.16-install-default-fix' into release-3.16Brad King2020-02-121-6/+38
| |\ \ \ \ \ \