diff options
| author | Michael Stürmer <michael.stuermer@schaeffler.com> | 2016-09-06 10:11:00 (GMT) |
|---|---|---|
| committer | Nils Gladitz <nilsgladitz@gmail.com> | 2016-09-06 15:44:48 (GMT) |
| commit | 1bc33257d48bb4b54333b755951967c6c3fa1df6 (patch) | |
| tree | 9279d779c344357821f3a5e199e8ca0410cec39d /Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx | |
| parent | 8317ea01aa3cf9319ef907e127fa6dbf9666cc53 (diff) | |
| download | CMake-1bc33257d48bb4b54333b755951967c6c3fa1df6.zip CMake-1bc33257d48bb4b54333b755951967c6c3fa1df6.tar.gz CMake-1bc33257d48bb4b54333b755951967c6c3fa1df6.tar.bz2 | |
CPackWIX: Fix incomplete CPACK_WIX_SKIP_PROGRAM_FOLDER implementation
Commit 17bbf6af (CPackWIX: Implement new CPACK_WIX_SKIP_PROGRAM_FOLDER
feature) generates GUIDs for most but not all components
when the feature is active.
Generate the remaining GUIDs as well.
Co-Author: Nils Gladitz <nilsgladitz@gmail.com>
Diffstat (limited to 'Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx')
| -rw-r--r-- | Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx b/Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx index 1747b62..7794935 100644 --- a/Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx +++ b/Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx @@ -13,8 +13,8 @@ #include "cmWIXFeaturesSourceWriter.h" cmWIXFeaturesSourceWriter::cmWIXFeaturesSourceWriter( - cmCPackLog* logger, std::string const& filename) - : cmWIXSourceWriter(logger, filename) + cmCPackLog* logger, std::string const& filename, GuidType componentGuidType) + : cmWIXSourceWriter(logger, filename, componentGuidType) { } @@ -24,7 +24,7 @@ void cmWIXFeaturesSourceWriter::CreateCMakePackageRegistryEntry( BeginElement("Component"); AddAttribute("Id", "CM_PACKAGE_REGISTRY"); AddAttribute("Directory", "TARGETDIR"); - AddAttribute("Guid", "*"); + AddAttribute("Guid", CreateGuidFromComponentId("CM_PACKAGE_REGISTRY")); std::string registryKey = std::string("Software\\Kitware\\CMake\\Packages\\") + package; |