diff options
author | michael-west <michael.west@ettus.com> | 2014-03-25 15:55:50 -0700 |
---|---|---|
committer | michael-west <michael.west@ettus.com> | 2014-03-25 15:55:50 -0700 |
commit | ff8a1252f3a51369abe0a165d963b781089ec66c (patch) | |
tree | fb1491c381beec89a7f706378dc3876b5d8e73b9 /host/cmake/Modules/UHDPackage.cmake | |
parent | 13b20fbef4fd7be8926c05207aafcdad620da536 (diff) | |
parent | 36583c5b6a6a50f9bc801efb57edcc86a1f49974 (diff) | |
download | uhd-ff8a1252f3a51369abe0a165d963b781089ec66c.tar.gz uhd-ff8a1252f3a51369abe0a165d963b781089ec66c.tar.bz2 uhd-ff8a1252f3a51369abe0a165d963b781089ec66c.zip |
Merge branch 'master' of github.com:EttusResearch/uhddev
Diffstat (limited to 'host/cmake/Modules/UHDPackage.cmake')
-rw-r--r-- | host/cmake/Modules/UHDPackage.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/host/cmake/Modules/UHDPackage.cmake b/host/cmake/Modules/UHDPackage.cmake index 4aea557c8..a98a52fc7 100644 --- a/host/cmake/Modules/UHDPackage.cmake +++ b/host/cmake/Modules/UHDPackage.cmake @@ -200,5 +200,7 @@ IF(MSVC) ENDIF(MSVC) ######################################################################## -SET(CPACK_SET_DESTDIR "ON") +IF(NOT ${CPACK_GENERATOR} STREQUAL NSIS) + SET(CPACK_SET_DESTDIR "ON") +ENDIF(NOT ${CPACK_GENERATOR} STREQUAL NSIS) INCLUDE(CPack) #include after setting vars |