diff options
| author | Vitaly Stakhovsky <vvs31415@users.noreply.gitlab.com> | 2023-01-15 15:13:14 (GMT) |
|---|---|---|
| committer | Vitaly Stakhovsky <vvs31415@users.noreply.gitlab.com> | 2023-01-16 04:39:02 (GMT) |
| commit | b3edfcf46ec1514a376d4e3dca7538cc750844d5 (patch) | |
| tree | c5a26d80efd9bbeb2783d8e6508097a2d9ee0b09 /Source/CPack/WiX | |
| parent | 701badbd20a33d8f955cb6d86016d5bf415b8212 (diff) | |
| download | CMake-b3edfcf46ec1514a376d4e3dca7538cc750844d5.zip CMake-b3edfcf46ec1514a376d4e3dca7538cc750844d5.tar.gz CMake-b3edfcf46ec1514a376d4e3dca7538cc750844d5.tar.bz2 | |
cmValue: Use operator* explicitly to convert to std::string; avoid extra call
Diffstat (limited to 'Source/CPack/WiX')
| -rw-r--r-- | Source/CPack/WiX/cmCPackWIXGenerator.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.cxx b/Source/CPack/WiX/cmCPackWIXGenerator.cxx index 5dae966..aeb3db3 100644 --- a/Source/CPack/WiX/cmCPackWIXGenerator.cxx +++ b/Source/CPack/WiX/cmCPackWIXGenerator.cxx @@ -422,9 +422,9 @@ void cmCPackWIXGenerator::CopyDefinition(cmWIXSourceWriter& source, cmValue value = GetOption(name); if (value) { if (type == DefinitionType::PATH) { - AddDefinition(source, name, CMakeToWixPath(value)); + AddDefinition(source, name, CMakeToWixPath(*value)); } else { - AddDefinition(source, name, value); + AddDefinition(source, name, *value); } } } @@ -504,7 +504,7 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles() } featureDefinitions.AddAttribute("Title", featureTitle); if (cmValue desc = GetOption("CPACK_WIX_ROOT_FEATURE_DESCRIPTION")) { - featureDefinitions.AddAttribute("Description", desc); + featureDefinitions.AddAttribute("Description", *desc); } featureDefinitions.AddAttribute("Level", "1"); this->Patch->ApplyFragment("#PRODUCTFEATURE", featureDefinitions); @@ -512,7 +512,7 @@ bool cmCPackWIXGenerator::CreateWiXSourceFiles() cmValue package = GetOption("CPACK_WIX_CMAKE_PACKAGE_REGISTRY"); if (package) { featureDefinitions.CreateCMakePackageRegistryEntry( - package, GetOption("CPACK_WIX_UPGRADE_GUID")); + *package, GetOption("CPACK_WIX_UPGRADE_GUID")); } if (!CreateFeatureHierarchy(featureDefinitions)) { |