diff options
| author | Michael Dickens <michael.dickens@ettus.com> | 2019-09-09 16:50:39 -0400 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2019-10-15 11:24:48 -0700 |
| commit | 90f8cbc12fe674d373652657b61b8466dcbc3469 (patch) | |
| tree | ae9c99fc657b3b25cd6fb4ed1e76a7c9e29056c7 /host/cmake/Modules/UHDConfig.cmake.in | |
| parent | ca7d9e14d1bd45a630a49e43836d80bcc7864b95 (diff) | |
| download | uhd-90f8cbc12fe674d373652657b61b8466dcbc3469.tar.gz uhd-90f8cbc12fe674d373652657b61b8466dcbc3469.tar.bz2 uhd-90f8cbc12fe674d373652657b61b8466dcbc3469.zip | |
cmake: add UHDBoost.cmake and use it for building UHD
Also install UHDBoost.cmake along with the CMake UHD find scripts, so
that it can be used by external modules. Tweak the UHDConfig.cmake
script so that, once installed, the new UHDBoost.cmake script is found.
Note that the project using UHD must first find UHD before trying to find
Boost. Also note that if the C++ standard is not set before UHDBoost is
loaded, it will be set to that currently used by UHD: C++14.
Diffstat (limited to 'host/cmake/Modules/UHDConfig.cmake.in')
| -rw-r--r-- | host/cmake/Modules/UHDConfig.cmake.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/host/cmake/Modules/UHDConfig.cmake.in b/host/cmake/Modules/UHDConfig.cmake.in index 30b0d92ff..299a8ef48 100644 --- a/host/cmake/Modules/UHDConfig.cmake.in +++ b/host/cmake/Modules/UHDConfig.cmake.in @@ -18,6 +18,9 @@ # ######################################################################## +# Allows us to use all .cmake files in this directory +list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_LIST_DIR}") + # set that this file was found, for use in GNU Radio's FindUHD.cmake. # Have to use the ENV, since this file might not allow CACHE changes. @@ -51,7 +54,6 @@ endif() list(APPEND UHD_INCLUDE_HINTS ${CMAKE_INSTALL_PREFIX}/include) list(APPEND UHD_LIBDIR_HINTS ${CMAKE_INSTALL_PREFIX}/lib) - # Search for static libs if so required if( UHD_USE_STATIC_LIBS ) set( _UHD_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) |