mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-30 11:08:51 -06:00
Code Issues Packages Projects Releases Wiki Activity
47,350 Commits 2 Branches 390 Tags
a7f2ff16a48486ec0ef5a1a2d73e13cf4106a50e
Commit Graph

28530 Commits

Author SHA1 Message Date
Vitaly Stakhovsky
a7f2ff16a4 cmState::GetCacheEntryProperty: return cmProp 2020-03-25 14:46:52 -04:00
Brad King
ea54f8d441 Merge topic 'cmake-compilation-no-compiler-extensions' 
f034b0f663 CMake compilation: do not use compiler extensions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4477
 2020-03-25 10:34:40 -04:00
Brad King
952fbd9ee5 Merge topic 'cmprop-state' 
ef408dd232 cmState::GetTargetTypeName: return type is *cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4505
 2020-03-25 09:25:26 -04:00
Brad King
d13d5c11cf Merge topic 'cmprop-cache' 
0bf0e35e59 cmCacheManager::GetProperty: return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4503
 2020-03-25 08:39:26 -04:00
Kitware Robot
69e495d10a CMake Nightly Date Stamp 2020-03-25 00:01:07 -04:00
Kitware Robot
c98ec3692e CMake Nightly Date Stamp 2020-03-24 00:01:07 -04:00
Brad King
a4abf61520 Merge topic 'cmake-gui-open-check' 
ecc0086bfc cmake-gui: Fix use-after-free in Open-possible check

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4508
 2020-03-23 09:27:44 -04:00
Marc Chevrier
f034b0f663 CMake compilation: do not use compiler extensions 
For now, compiler extensions are no longer activated on CMake sources.
However these extensions are still used for various third parties.

This MR is a partial answer to the issue #20454.
 2020-03-23 10:29:58 +01:00
Kitware Robot
8638c49f2a CMake Nightly Date Stamp 2020-03-23 00:01:05 -04:00
Kitware Robot
7099db5dd4 CMake Nightly Date Stamp 2020-03-22 00:01:11 -04:00
Kitware Robot
8bef78bb73 CMake Nightly Date Stamp 2020-03-21 00:01:12 -04:00
Francisco Facioni
ecc0086bfc cmake-gui: Fix use-after-free in Open-possible check 
Fix `QCMake::checkOpenPossible` to copy `toLocal8Bit().data()` before
its lifetime expires.
 2020-03-20 08:38:31 -04:00
Brad King
e3185e3d1b CMake 3.17.0 2020-03-20 06:26:14 -04:00
Brad King
119d1dadce Merge topic 'export-repeat' into release-3.17 
8affe9aa33 export: Fix use-after-free on multiple calls overwriting same FILE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4494
 2020-03-20 06:17:00 -04:00
Brad King
94139ac58e Merge topic 'export-repeat' 
8affe9aa33 export: Fix use-after-free on multiple calls overwriting same FILE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4494
 2020-03-20 06:17:00 -04:00
Kitware Robot
9bbea2344b CMake Nightly Date Stamp 2020-03-20 00:01:11 -04:00
Vitaly Stakhovsky
ef408dd232 cmState::GetTargetTypeName: return type is *cmProp 2020-03-19 08:55:03 -04:00
Vitaly Stakhovsky
0bf0e35e59 cmCacheManager::GetProperty: return cmProp 2020-03-19 08:18:42 -04:00
Brad King
60db3af147 Merge topic 'cmprop-state' 
bd89133543 cmState::GetCacheEntryValue: return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4493
 2020-03-19 07:18:27 -04:00
Brad King
7bdf84d2d5 Merge topic 'target-improve' 
b915fec56e cmTarget: minor code improvements

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4483
 2020-03-19 07:17:39 -04:00
Brad King
0586123ede Merge topic 'trace-format-json-doc' 
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
 2020-03-19 06:57:52 -04:00
Brad King
8affe9aa33 export: Fix use-after-free on multiple calls overwriting same FILE 
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
 2020-03-19 06:41:39 -04:00
Kitware Robot
d995be9ead CMake Nightly Date Stamp 2020-03-19 00:01:09 -04:00
Kyle Edwards
1994f950ff cmake: List valid values for --trace-format on the command line 2020-03-18 16:16:46 -04:00
Kitware Robot
5a8eec41fc CMake Nightly Date Stamp 2020-03-18 00:01:11 -04:00
Vitaly Stakhovsky
bd89133543 cmState::GetCacheEntryValue: return cmProp 2020-03-17 12:09:20 -04:00
Vitaly Stakhovsky
b915fec56e cmTarget: minor code improvements 2020-03-17 08:33:57 -04:00
Brad King
bee0100396 Merge topic 'file-archive' 
c7e1198a23 file: Add ARCHIVE_{CREATE|EXTRACT} subcommands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4475
 2020-03-17 08:06:57 -04:00
Brad King
97562a2023 Merge topic 'property-computer' 
fad0ee5404 cmTargetPropertyComputer::GetProperty: return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4482
 2020-03-17 08:06:18 -04:00
Brad King
d2e0b8bcfd Merge topic 'prop_t' 
60f57d0dcc cmPropertyMap: Introduce cmProp as return type for GetProperty() functions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4471
 2020-03-17 08:05:29 -04:00
Brad King
2b720f6ab6 Merge topic 'mf_profiling_json' 
897af4c266 cmMakefileProfilingData: Fix ambiguous conversion to Json::Value

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4479
 2020-03-17 08:04:46 -04:00
Kitware Robot
372f269952 CMake Nightly Date Stamp 2020-03-17 00:01:09 -04:00
Vitaly Stakhovsky
fad0ee5404 cmTargetPropertyComputer::GetProperty: return cmProp 2020-03-16 13:47:05 -04:00
Brad King
6f4b1ba96d Merge topic 'define-property' 
73d52a862b cmPropertyDefinition: Construct directly in defined state

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4470
 2020-03-16 11:40:59 -04:00
Brad King
e08af3e6b8 Merge topic 'remove_trailing_whitespace' 
67a592583d Source: Remove trailing whitespace from export generation code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4474
 2020-03-16 11:32:14 -04:00
Cristian Adam
c7e1198a23 file: Add ARCHIVE_{CREATE|EXTRACT} subcommands 
Fixes: #20443
 2020-03-16 14:33:27 +01:00
Raul Tambre
897af4c266 cmMakefileProfilingData: Fix ambiguous conversion to Json::Value 2020-03-16 14:46:11 +02:00
Kitware Robot
eb7e8d1529 CMake Nightly Date Stamp 2020-03-16 00:01:07 -04:00
Kitware Robot
a6d95f57cc CMake Nightly Date Stamp 2020-03-15 00:01:27 -04:00
Kitware Robot
9f3e8853f8 CMake Nightly Date Stamp 2020-03-14 00:01:09 -04:00
Vitaly Stakhovsky
60f57d0dcc cmPropertyMap: Introduce cmProp as return type for GetProperty() functions 
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.
 2020-03-13 13:32:17 -04:00
Brad King
200bc3b785 Merge topic 'swift-implicit-module-include-dir' 
2026915f8f Swift: Propagate Swift_MODULE_DIRECTORY as include directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4320
 2020-03-13 11:00:39 -04:00
Brad King
1b5554e863 Merge topic 'profiling' 
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
 2020-03-13 10:59:03 -04:00
Alexandru Croitor
67a592583d Source: Remove trailing whitespace from export generation code 2020-03-13 15:31:38 +01:00
Vitaly Stakhovsky
73d52a862b cmPropertyDefinition: Construct directly in defined state 
Move `cmPropertyDefinitionMap::DefineProperty` functionality
directly into the constructor to avoid an intermediate state.
 2020-03-13 10:24:51 -04:00
Kitware Robot
78fd95fc1d CMake Nightly Date Stamp 2020-03-13 00:01:11 -04:00
Saleem Abdulrasool
2026915f8f Swift: Propagate Swift_MODULE_DIRECTORY as include directory 
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
 2020-03-12 11:50:43 -04:00
Brad King
1ec72e0947 CMake 3.17.0-rc3 2020-03-12 09:45:24 -04:00
Brad King
d584d01103 Merge topic 'swift-link-line-spaces' into release-3.17 
af39d1b993 Swift: Fix quoting of library search paths with spaces

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4469
 2020-03-12 09:32:01 -04:00
Brad King
1e3af78f63 Merge topic 'swift-link-line-spaces' 
af39d1b993 Swift: Fix quoting of library search paths with spaces

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4469
 2020-03-12 09:32:01 -04:00