diff options
| author | Brad King <brad.king@kitware.com> | 2019-07-26 11:29:19 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-07-26 11:32:18 (GMT) |
| commit | 467e6ac728cefa484f9e9369a7da4d05b04ec403 (patch) | |
| tree | a5a22d30ca5ab813f3f8f4db40144a132005a68f /Source/cmGlobalVisualStudio14Generator.cxx | |
| parent | c23c4ed9cf912e265e1070507905b3dbc495a210 (diff) | |
| parent | e91bfe440c1419b445ef6746552dd03ba302e6cf (diff) | |
| download | CMake-467e6ac728cefa484f9e9369a7da4d05b04ec403.zip CMake-467e6ac728cefa484f9e9369a7da4d05b04ec403.tar.gz CMake-467e6ac728cefa484f9e9369a7da4d05b04ec403.tar.bz2 | |
Merge topic 'definitions_string_view'
e91bfe440c cmMakefile: Let AddDefinition accept a value as cm::string_view
f2ba968ef2 cmMakefile: Simplify and rename AddDefinitionBool
9b5cc42531 cmDefinitions: Remove const char* based Set method
e268840c0a cmDefinitions: Add Unset and cm::string_view based Set methods
451fd329a8 cmDefinitions: Cleanups
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3577
Diffstat (limited to 'Source/cmGlobalVisualStudio14Generator.cxx')
| -rw-r--r-- | Source/cmGlobalVisualStudio14Generator.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalVisualStudio14Generator.cxx b/Source/cmGlobalVisualStudio14Generator.cxx index 6509b56..cd48474 100644 --- a/Source/cmGlobalVisualStudio14Generator.cxx +++ b/Source/cmGlobalVisualStudio14Generator.cxx @@ -182,7 +182,7 @@ void cmGlobalVisualStudio14Generator::SetWindowsTargetPlatformVersion( mf->DisplayStatus(e.str(), -1); } mf->AddDefinition("CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION", - this->WindowsTargetPlatformVersion.c_str()); + this->WindowsTargetPlatformVersion); } bool cmGlobalVisualStudio14Generator::SelectWindowsStoreToolset( |