summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2014-11-25 14:18:06 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2014-11-25 14:18:06 (GMT)
commit5816073846c524b5845ab3ba17cd3c1f9f883952 (patch)
treea5aa08d19f15f82ab04d90ff9f458322dca202ba
parentb59663156da7e89fda153bd8b0ed0c41b30c2f28 (diff)
downloadhdf5-5816073846c524b5845ab3ba17cd3c1f9f883952.zip
hdf5-5816073846c524b5845ab3ba17cd3c1f9f883952.tar.gz
hdf5-5816073846c524b5845ab3ba17cd3c1f9f883952.tar.bz2
[svn-r25842] Change WiX program check to use the ENV variable for path.
Tested: Windows
-rw-r--r--CMakeInstallation.cmake5
1 files changed, 4 insertions, 1 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake
index 9c92a29..651382c 100644
--- a/CMakeInstallation.cmake
+++ b/CMakeInstallation.cmake
@@ -5,7 +5,10 @@ include (${HDF_RESOURCES_DIR}/CMakePackageConfigHelpers.cmake)
#-----------------------------------------------------------------------------
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)
#-----------------------------------------------------------------------------