diff options
| author | Stephen Sorley <ssorley@monetra.com> | 2017-10-09 11:39:29 -0400 |
|---|---|---|
| committer | Stephen Sorley <ssorley@monetra.com> | 2017-10-13 13:07:37 -0400 |
| commit | e1409101c99f7a3487990e9927e8bd0e275f564f (patch) | |
| tree | e5c0ecb010bc9bbfc11aeea8a2e65bbe9eafd14a /Source/CPack/cmCPackGeneratorFactory.cxx | |
| parent | e258fe03968d27871d6a57e3f4571bc8fbba6b9b (diff) | |
| download | cmake-e1409101c99f7a3487990e9927e8bd0e275f564f.tar.gz | |
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/cmCPackGeneratorFactory.cxx')
| -rw-r--r-- | Source/CPack/cmCPackGeneratorFactory.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx index 4b81bbc5f9..47e7527072 100644 --- a/Source/CPack/cmCPackGeneratorFactory.cxx +++ b/Source/CPack/cmCPackGeneratorFactory.cxx @@ -40,7 +40,7 @@ #include "cmCPackRPMGenerator.h" #endif -#ifdef _WIN32 +#if defined(_WIN32) || (defined(__CYGWIN__) && defined(HAVE_LIBUUID)) #include "WiX/cmCPackWIXGenerator.h" #endif @@ -87,7 +87,7 @@ cmCPackGeneratorFactory::cmCPackGeneratorFactory() this->RegisterGenerator("7Z", "7-Zip file format", cmCPack7zGenerator::CreateGenerator); } -#ifdef _WIN32 +#if defined(_WIN32) || (defined(__CYGWIN__) && defined(HAVE_LIBUUID)) if (cmCPackWIXGenerator::CanGenerate()) { this->RegisterGenerator("WIX", "MSI file format via WiX tools", cmCPackWIXGenerator::CreateGenerator); |