diff options
author | Stephen Sorley <ssorley@monetra.com> | 2017-10-09 15:39:29 (GMT) |
---|---|---|
committer | Stephen Sorley <ssorley@monetra.com> | 2017-10-13 17:07:37 (GMT) |
commit | e1409101c99f7a3487990e9927e8bd0e275f564f (patch) | |
tree | e5c0ecb010bc9bbfc11aeea8a2e65bbe9eafd14a /Source/CPack/WiX/cmWIXFilesSourceWriter.cxx | |
parent | e258fe03968d27871d6a57e3f4571bc8fbba6b9b (diff) | |
download | CMake-e1409101c99f7a3487990e9927e8bd0e275f564f.zip CMake-e1409101c99f7a3487990e9927e8bd0e275f564f.tar.gz CMake-e1409101c99f7a3487990e9927e8bd0e275f564f.tar.bz2 |
cpack wix: support WiX generator on Cygwin
Cygwin-built CMake now converts paths from Cygwin to Windows form
(using cygpath -w) before they're passed to WiX.
The Wix generator on Cygwin requires the libuuid-dev package when
building CMake. However, the DLL it links to is installed by default
as part of Cygwin's core libs, so it does not need to be distributed.
If libuuid-dev isn't available, CMake is simply built without Wix
support on Cygwin.
Diffstat (limited to 'Source/CPack/WiX/cmWIXFilesSourceWriter.cxx')
-rw-r--r-- | Source/CPack/WiX/cmWIXFilesSourceWriter.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx index b4cd1a3..dd3caf9 100644 --- a/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx +++ b/Source/CPack/WiX/cmWIXFilesSourceWriter.cxx @@ -11,6 +11,8 @@ #include "cm_sys_stat.h" +#include "cmCMakeToWixPath.h" + cmWIXFilesSourceWriter::cmWIXFilesSourceWriter(cmCPackLog* logger, std::string const& filename, GuidType componentGuidType) @@ -139,7 +141,7 @@ std::string cmWIXFilesSourceWriter::EmitComponentFile( patch.ApplyFragment(componentId, *this); BeginElement("File"); AddAttribute("Id", fileId); - AddAttribute("Source", filePath); + AddAttribute("Source", CMakeToWixPath(filePath)); AddAttribute("KeyPath", "yes"); mode_t fileMode = 0; |