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/CMakeLists.txt | |
| 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/CMakeLists.txt')
| -rw-r--r-- | host/CMakeLists.txt | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index c41776aae..be280f785 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -167,22 +167,6 @@ IF(MSVC) ADD_DEFINITIONS(/bigobj) #Increases the number of addressable sections in an .obj file. ENDIF(MSVC) -IF(MINGW) - #Avoid depending on MinGW runtime DLLs - CHECK_CXX_COMPILER_FLAG(-static-libgcc HAVE_STATIC_LIBGCC_FLAG) - IF(HAVE_STATIC_LIBGCC_FLAG) - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc") - SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-libgcc") - SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -static-libgcc") - ENDIF() - CHECK_CXX_COMPILER_FLAG(-static-libstdc++ HAVE_STATIC_LIBSTDCXX_FLAG) - IF(HAVE_STATIC_LIBSTDCXX_FLAG) - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++") - SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -static-libstdc++") - SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -static-libstdc++") - ENDIF() -ENDIF() - IF(CYGWIN) ADD_DEFINITIONS(-D__USE_W32_SOCKETS) #boost asio says we need this ENDIF(CYGWIN) |