summaryrefslogtreecommitdiffstats
path: root/Source/CPack/WiX/cmCPackWIXGenerator.h
diff options
context:
space:
mode:
authorNils Gladitz <nilsgladitz@gmail.com>2014-04-18 20:45:30 (GMT)
committerNils Gladitz <nilsgladitz@gmail.com>2014-04-18 20:45:30 (GMT)
commitcb59f5da97723f648df78fd16d95697008d5d42b (patch)
tree10fdddeb54f77a683c96258dc6a30330162a4ec3 /Source/CPack/WiX/cmCPackWIXGenerator.h
parent3970b5de0ff2023dd34d49c4dff2d8bd822ca596 (diff)
downloadCMake-cb59f5da97723f648df78fd16d95697008d5d42b.zip
CMake-cb59f5da97723f648df78fd16d95697008d5d42b.tar.gz
CMake-cb59f5da97723f648df78fd16d95697008d5d42b.tar.bz2
CPackWIX: Delay creation of cmWIXPatch until CPack has initialized Logger
Without the fix CPack will crash when the cmWIXPatch class tries to issue any diagnostics.
Diffstat (limited to 'Source/CPack/WiX/cmCPackWIXGenerator.h')
-rw-r--r--Source/CPack/WiX/cmCPackWIXGenerator.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/CPack/WiX/cmCPackWIXGenerator.h b/Source/CPack/WiX/cmCPackWIXGenerator.h
index 4c9f8c7..8705d40 100644
--- a/Source/CPack/WiX/cmCPackWIXGenerator.h
+++ b/Source/CPack/WiX/cmCPackWIXGenerator.h
@@ -35,6 +35,7 @@ public:
cmCPackTypeMacro(cmCPackWIXGenerator, cmCPackGenerator);
cmCPackWIXGenerator();
+ ~cmCPackWIXGenerator();
protected:
virtual int InitializeInternal();
@@ -166,7 +167,7 @@ private:
std::string CPackTopLevel;
- cmWIXPatch Patch;
+ cmWIXPatch* Patch;
};
#endif