summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Sorley <ssorley@monetra.com>2017-10-09 15:28:25 (GMT)
committerStephen Sorley <ssorley@monetra.com>2017-10-13 15:48:36 (GMT)
commite258fe03968d27871d6a57e3f4571bc8fbba6b9b (patch)
tree0c515960c372befe39c65c92f121465c15122905
parentcb8f26f199e18be231f40f523bfe64375e749e35 (diff)
downloadCMake-e258fe03968d27871d6a57e3f4571bc8fbba6b9b.zip
CMake-e258fe03968d27871d6a57e3f4571bc8fbba6b9b.tar.gz
CMake-e258fe03968d27871d6a57e3f4571bc8fbba6b9b.tar.bz2
cpack wix: fix path error on cygwin
Under Cygwin, file(TO_CMAKE_PATH...) outputs invalid paths when given a Windows path as input (the colon after the drive letter gets replaced by a semicolon). As a workaround, just use a string replace to change the slashes instead.
-rw-r--r--Modules/CPackWIX.cmake2
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