From 86924e9cca30b3f4d61fa2d2697d742afa6f73b0 Mon Sep 17 00:00:00 2001 From: Nicholas Corgan Date: Wed, 22 Jul 2015 14:46:31 -0700 Subject: 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 --- host/cmake/Modules/UHDPackage.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'host/cmake/Modules') 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) -- cgit v1.2.3