diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-04-07 17:42:07 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-04-07 17:42:07 -0700 |
| commit | 088b852844692e9d366e3e44336883adf0305623 (patch) | |
| tree | c25d8faef3a3364a3716c4a935c6a60c7d6515dc /host/cmake | |
| parent | 2bdc0e2e31a302fb6016d0338c68acb13612e398 (diff) | |
| parent | 1a002d38ac27656d0bae4a06314add0f586195d1 (diff) | |
| download | uhd-088b852844692e9d366e3e44336883adf0305623.tar.gz uhd-088b852844692e9d366e3e44336883adf0305623.tar.bz2 uhd-088b852844692e9d366e3e44336883adf0305623.zip | |
Merge branch 'maint'
Conflicts:
host/lib/usrp/cores/gpio_core_200.cpp
Diffstat (limited to 'host/cmake')
| -rw-r--r-- | host/cmake/Modules/UHDPackage.cmake | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/host/cmake/Modules/UHDPackage.cmake b/host/cmake/Modules/UHDPackage.cmake index 08c2a6c53..b9fcdf9ed 100644 --- a/host/cmake/Modules/UHDPackage.cmake +++ b/host/cmake/Modules/UHDPackage.cmake @@ -218,7 +218,4 @@ IF(WIN32) ENDIF(WIN32) ######################################################################## -IF(NOT ${CPACK_GENERATOR} STREQUAL NSIS) - SET(CPACK_SET_DESTDIR "ON") -ENDIF(NOT ${CPACK_GENERATOR} STREQUAL NSIS) INCLUDE(CPack) #include after setting vars |