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/tests | |
| 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/tests')
| -rw-r--r-- | host/tests/CMakeLists.txt | 6 |
1 files changed, 1 insertions, 5 deletions
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}) |