diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-15 13:49:37 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-04-15 13:49:46 (GMT) |
| commit | 156196938c5e03e881592dd3247021063167abc0 (patch) | |
| tree | 4ff6facbd687820d7f73bd0829f96d8a582360d7 /Source/cmVisualStudio10TargetGenerator.h | |
| parent | ad386d42d7bb4c6c13c9b3abf4c06ef98f03dbb5 (diff) | |
| parent | e64fa5f1b611353522ec014192046ab3bf67e69f (diff) | |
| download | CMake-156196938c5e03e881592dd3247021063167abc0.zip CMake-156196938c5e03e881592dd3247021063167abc0.tar.gz CMake-156196938c5e03e881592dd3247021063167abc0.tar.bz2 | |
Merge topic 'cmprop-source'
e64fa5f1b6 cmSourceFile::GetProperty: return cmProp
fc223f9860 cmGlobalXCodeGenerator: Fix genex interpreter overloads
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4603
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.h')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.h b/Source/cmVisualStudio10TargetGenerator.h index 4ac5ec0..e3782f4 100644 --- a/Source/cmVisualStudio10TargetGenerator.h +++ b/Source/cmVisualStudio10TargetGenerator.h @@ -244,7 +244,7 @@ private: std::unordered_map<std::string, ConfigToSettings> ParsedToolTargetSettings; bool PropertyIsSameInAllConfigs(const ConfigToSettings& toolSettings, const std::string& propName); - void ParseSettingsProperty(const char* settingsPropertyValue, + void ParseSettingsProperty(const std::string& settingsPropertyValue, ConfigToSettings& toolSettings); std::string GetCMakeFilePath(const char* name) const; }; |