From be054d6f6bed03995d7b17b7e287d61cebf20d8b Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Tue, 25 Nov 2014 09:18:06 -0500
Subject: [svn-r25842] Change WiX program check to use the ENV variable for
 path.

Tested: Windows
---
 CMakeInstallation.cmake | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
index f2053b5..c1ab22a 100644
--- a/CMakeInstallation.cmake
+++ b/CMakeInstallation.cmake
@@ -4,7 +4,10 @@
 #-----------------------------------------------------------------------------
 if (WIN32)
   find_program (NSIS_EXECUTABLE NSIS.exe PATHS "$ENV{ProgramFiles}\\NSIS" "$ENV{ProgramFiles(x86)}\\NSIS")
-  find_program (WIX_EXECUTABLE candle  PATHS "$ENV{ProgramFiles}\\WiX\ Toolset\ v3.9\\bin" "$ENV{ProgramFiles(x86)}\\WiX\ Toolset\ v3.9\\bin")
+  if(NOT CPACK_WIX_ROOT)
+    file(TO_CMAKE_PATH "$ENV{WIX}" CPACK_WIX_ROOT)
+  endif()
+  find_program (WIX_EXECUTABLE candle  PATHS "${CPACK_WIX_ROOT}/bin")
 endif (WIN32)
 
 #-----------------------------------------------------------------------------
-- 
cgit v0.12