diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2015-07-22 14:46:31 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-07-23 14:37:16 -0700 |
| commit | 86924e9cca30b3f4d61fa2d2697d742afa6f73b0 (patch) | |
| tree | f561a61d773979198d24765aa3fa62037afb7e54 /host/cmake/Modules | |
| parent | 62cd8c618ebeef0354b7f0d34ed2c0310f6f11dc (diff) | |
| download | uhd-86924e9cca30b3f4d61fa2d2697d742afa6f73b0.tar.gz uhd-86924e9cca30b3f4d61fa2d2697d742afa6f73b0.tar.bz2 uhd-86924e9cca30b3f4d61fa2d2697d742afa6f73b0.zip | |
cmake: MinGW improvements
* Improved toolchan file, accounts for different versions
* Don't force static runtime linking (was causing test errors)
* Include MinGW runtime in packaging
Diffstat (limited to 'host/cmake/Modules')
| -rw-r--r-- | host/cmake/Modules/UHDPackage.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/cmake/Modules/UHDPackage.cmake b/host/cmake/Modules/UHDPackage.cmake index 298b9d33a..a17af9c61 100644 --- a/host/cmake/Modules/UHDPackage.cmake +++ b/host/cmake/Modules/UHDPackage.cmake @@ -210,10 +210,10 @@ SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " DeleteRegValue HKLM ${HLKM_ENV} \\\"UHD_PKG_PATH\\\" ") -IF(MSVC) - #Install necessary MSVC runtime DLL's +IF(WIN32) + #Install necessary runtime DLL's INCLUDE(InstallRequiredSystemLibraries) -ENDIF(MSVC) +ENDIF(WIN32) ######################################################################## IF(NOT ${CPACK_GENERATOR} STREQUAL NSIS) |