diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-16 13:47:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-10-16 13:48:02 (GMT) |
| commit | 9de7ae6e5ec46f87b318591c0e1a32f98df26c63 (patch) | |
| tree | bf44f3da91d0a962682108335e8537d3d63f398d /Modules | |
| parent | 42461a2a01e314dffe8841bef329d44d180e0044 (diff) | |
| parent | e1409101c99f7a3487990e9927e8bd0e275f564f (diff) | |
| download | CMake-9de7ae6e5ec46f87b318591c0e1a32f98df26c63.zip CMake-9de7ae6e5ec46f87b318591c0e1a32f98df26c63.tar.gz CMake-9de7ae6e5ec46f87b318591c0e1a32f98df26c63.tar.bz2 | |
Merge topic 'cpack-wix-cygwin'
e1409101 cpack wix: support WiX generator on Cygwin
e258fe03 cpack wix: fix path error on cygwin
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1367
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CPackWIX.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/CPackWIX.cmake b/Modules/CPackWIX.cmake index 1dc37d4..c723e72 100644 --- a/Modules/CPackWIX.cmake +++ b/Modules/CPackWIX.cmake @@ -289,7 +289,7 @@ # if(NOT CPACK_WIX_ROOT) - file(TO_CMAKE_PATH "$ENV{WIX}" CPACK_WIX_ROOT) + string(REPLACE "\\" "/" CPACK_WIX_ROOT "$ENV{WIX}") endif() find_program(CPACK_WIX_CANDLE_EXECUTABLE candle |