diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2015-03-02 23:10:57 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2015-03-02 23:10:57 (GMT) |
| commit | 690b832ce1de4698a7fbe1f49b3c71d8c0a5fc14 (patch) | |
| tree | d5bea357e6e1f96f52bc09d9ad314d8c24f44223 /CMakeInstallation.cmake | |
| parent | b53d5c485c94db8083bc36e5bf6cca3aa017a103 (diff) | |
| download | hdf5-690b832ce1de4698a7fbe1f49b3c71d8c0a5fc14.zip hdf5-690b832ce1de4698a7fbe1f49b3c71d8c0a5fc14.tar.gz hdf5-690b832ce1de4698a7fbe1f49b3c71d8c0a5fc14.tar.bz2 | |
[svn-r26344] Bring revisions #25870 - #25902 from trunk to revise_chunks.
h5committested.
Diffstat (limited to 'CMakeInstallation.cmake')
| -rw-r--r-- | CMakeInstallation.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeInstallation.cmake b/CMakeInstallation.cmake index 651382c..095fb4b 100644 --- a/CMakeInstallation.cmake +++ b/CMakeInstallation.cmake @@ -4,7 +4,8 @@ include (${HDF_RESOURCES_DIR}/CMakePackageConfigHelpers.cmake) # Check for Installation Utilities #----------------------------------------------------------------------------- if (WIN32) - find_program (NSIS_EXECUTABLE NSIS.exe PATHS "$ENV{ProgramFiles}\\NSIS" "$ENV{ProgramFiles(x86)}\\NSIS") + set (PF_ENV_EXT "(x86)") + find_program (NSIS_EXECUTABLE NSIS.exe PATHS "$ENV{ProgramFiles}\\NSIS" "$ENV{ProgramFiles${PF_ENV_EXT}}\\NSIS") if(NOT CPACK_WIX_ROOT) file(TO_CMAKE_PATH "$ENV{WIX}" CPACK_WIX_ROOT) endif() |