diff options
| author | Martin Braun <martin.braun@ettus.com> | 2014-08-18 13:38:04 +0200 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2014-08-18 13:38:04 +0200 |
| commit | 90fd966e25b0947483defbe5e3a7247e00c06619 (patch) | |
| tree | 104a3567b3cf5bd12d8fa7d2e0053ed525bdc0e5 /host/lib | |
| parent | 94c2740bc009ea813938db03807c6f9666c32561 (diff) | |
| parent | 7297ebffc344cce30f2570b1587beae94adeed1e (diff) | |
| download | uhd-90fd966e25b0947483defbe5e3a7247e00c06619.tar.gz uhd-90fd966e25b0947483defbe5e3a7247e00c06619.tar.bz2 uhd-90fd966e25b0947483defbe5e3a7247e00c06619.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/convert/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | host/lib/ic_reg_maps/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | host/lib/types/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | host/lib/utils/CMakeLists.txt | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/convert/CMakeLists.txt b/host/lib/convert/CMakeLists.txt index 473b7f59f..363555f45 100644 --- a/host/lib/convert/CMakeLists.txt +++ b/host/lib/convert/CMakeLists.txt @@ -66,7 +66,7 @@ ENDIF() SET(CMAKE_REQUIRED_FLAGS ${EMMINTRIN_FLAGS}) CHECK_INCLUDE_FILE_CXX(emmintrin.h HAVE_EMMINTRIN_H) -UNSET(CMAKE_REQUIRED_FLAGS) +SET(CMAKE_REQUIRED_FLAGS) IF(HAVE_EMMINTRIN_H) SET(convert_with_sse2_sources diff --git a/host/lib/ic_reg_maps/CMakeLists.txt b/host/lib/ic_reg_maps/CMakeLists.txt index 889c725db..c810c04ad 100644 --- a/host/lib/ic_reg_maps/CMakeLists.txt +++ b/host/lib/ic_reg_maps/CMakeLists.txt @@ -117,4 +117,4 @@ LIBUHD_PYTHON_GEN_SOURCE( ${CMAKE_CURRENT_BINARY_DIR}/lmk04816_regs.hpp ) -UNSET(LIBUHD_PYTHON_GEN_SOURCE_DEPS) +SET(LIBUHD_PYTHON_GEN_SOURCE_DEPS) diff --git a/host/lib/types/CMakeLists.txt b/host/lib/types/CMakeLists.txt index 7fc6bdd94..f19043c1e 100644 --- a/host/lib/types/CMakeLists.txt +++ b/host/lib/types/CMakeLists.txt @@ -31,7 +31,7 @@ CHECK_CXX_SOURCE_COMPILES(" } " HAVE_CLOCK_GETTIME ) -UNSET(CMAKE_REQUIRED_LIBRARIES) +SET(CMAKE_REQUIRED_LIBRARIES) INCLUDE(CheckCXXSourceCompiles) CHECK_CXX_SOURCE_COMPILES(" diff --git a/host/lib/utils/CMakeLists.txt b/host/lib/utils/CMakeLists.txt index 2252f3221..106e2b650 100644 --- a/host/lib/utils/CMakeLists.txt +++ b/host/lib/utils/CMakeLists.txt @@ -84,7 +84,7 @@ CHECK_CXX_SOURCE_COMPILES(" } " HAVE_DLOPEN ) -UNSET(CMAKE_REQUIRED_LIBRARIES) +SET(CMAKE_REQUIRED_LIBRARIES) CHECK_CXX_SOURCE_COMPILES(" #define WIN32_LEAN_AND_MEAN |