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/tests/CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'host/tests') diff --git a/host/tests/CMakeLists.txt b/host/tests/CMakeLists.txt index 596ab1017..1fb1a1951 100644 --- a/host/tests/CMakeLists.txt +++ b/host/tests/CMakeLists.txt @@ -48,11 +48,7 @@ SET(test_sources ) #turn each test cpp file into an executable with an int main() function -IF(MINGW) - ADD_DEFINITIONS(-DBOOST_TEST_MAIN) -ELSE() - ADD_DEFINITIONS(-DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN) -ENDIF() +ADD_DEFINITIONS(-DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN) SET(UHD_TEST_TARGET_DEPS uhd) SET(UHD_TEST_LIBRARY_DIRS ${Boost_LIBRARY_DIRS}) -- cgit v1.2.3