diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2015-03-02 03:34:28 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2015-03-02 03:34:28 (GMT) |
| commit | b53d5c485c94db8083bc36e5bf6cca3aa017a103 (patch) | |
| tree | 99ce843964fccefc8684dac2cd35ac86d762c8f3 /CMakeInstallation.cmake | |
| parent | f8f7c0dfaaf33ae0d69fd077a68bcb3239c4b9ec (diff) | |
| download | hdf5-b53d5c485c94db8083bc36e5bf6cca3aa017a103.zip hdf5-b53d5c485c94db8083bc36e5bf6cca3aa017a103.tar.gz hdf5-b53d5c485c94db8083bc36e5bf6cca3aa017a103.tar.bz2 | |
[svn-r26334] Bring revision #25818 - #25870 from trunk to revise_chunks.
h5committested.
Diffstat (limited to 'CMakeInstallation.cmake')
| -rw-r--r-- | CMakeInstallation.cmake | 5 |
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) #----------------------------------------------------------------------------- |