diff options
| author | Martin Braun <martin.braun@ettus.com> | 2017-03-23 15:40:28 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-12-22 15:03:44 -0800 |
| commit | 6d332e5ca4a7311406ac285f827c31c9e5b94280 (patch) | |
| tree | 77098d97db8e8884124d66617721724821a80ced /mpm/python | |
| parent | ef6326a174e6880be5e2eaeac26a2c5de0768807 (diff) | |
| download | uhd-6d332e5ca4a7311406ac285f827c31c9e5b94280.tar.gz uhd-6d332e5ca4a7311406ac285f827c31c9e5b94280.tar.bz2 uhd-6d332e5ca4a7311406ac285f827c31c9e5b94280.zip | |
mpm: move public includes into include/
Diffstat (limited to 'mpm/python')
| -rw-r--r-- | mpm/python/CMakeLists.txt | 38 | ||||
| -rw-r--r-- | mpm/python/pyusrp_periphs.cpp | 10 |
2 files changed, 43 insertions, 5 deletions
diff --git a/mpm/python/CMakeLists.txt b/mpm/python/CMakeLists.txt index 7a88abfc7..382f244c9 100644 --- a/mpm/python/CMakeLists.txt +++ b/mpm/python/CMakeLists.txt @@ -19,6 +19,44 @@ # This file included, use CMake directory variables ######################################################################## +######################################################################## +# Setup Boost +######################################################################## +MESSAGE(STATUS "") +MESSAGE(STATUS "Configuring Boost C++ Libraries...") +SET(BOOST_REQUIRED_COMPONENTS + python + system +) +IF(MINGW) + LIST(APPEND BOOST_REQUIRED_COMPONENTS thread_win32) +ELSE() + LIST(APPEND BOOST_REQUIRED_COMPONENTS thread) +ENDIF() + +IF(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64") + LIST(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix +ENDIF(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64") + +IF(MSVC) + SET(BOOST_ALL_DYN_LINK "${BOOST_ALL_DYN_LINK}" CACHE BOOL "boost enable dynamic linking") + IF(BOOST_ALL_DYN_LINK) + ADD_DEFINITIONS(-DBOOST_ALL_DYN_LINK) #setup boost auto-linking in msvc + ELSE(BOOST_ALL_DYN_LINK) + SET(BOOST_REQUIRED_COMPONENTS) #empty components list for static link + ENDIF(BOOST_ALL_DYN_LINK) +ENDIF(MSVC) + +SET(Boost_ADDITIONAL_VERSIONS + "1.46.0" "1.46" "1.47.0" "1.47" "1.48.0" "1.48" "1.48.0" "1.49" "1.50.0" "1.50" + "1.51.0" "1.51" "1.52.0" "1.52" "1.53.0" "1.53" "1.54.0" "1.54" "1.55.0" "1.55" + "1.56.0" "1.56" "1.57" "1.57" "1.58" "1.59" "1.60" "1.61" +) +FIND_PACKAGE(Boost 1.53 COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) + +MESSAGE(STATUS "Boost include directories: ${Boost_INCLUDE_DIRS}") +MESSAGE(STATUS "Boost library directories: ${Boost_LIBRARY_DIRS}") +MESSAGE(STATUS "Boost libraries: ${Boost_LIBRARIES}") SET(UHD_HOST_ROOT ${CMAKE_SOURCE_DIR}/../host) LIST(APPEND diff --git a/mpm/python/pyusrp_periphs.cpp b/mpm/python/pyusrp_periphs.cpp index 348e19c5c..397fab06a 100644 --- a/mpm/python/pyusrp_periphs.cpp +++ b/mpm/python/pyusrp_periphs.cpp @@ -27,11 +27,11 @@ //#include "types.hpp" #include "converters.hpp" -#include "net_helper.hpp" -#include "xbar_iface.hpp" -#include "udev_helper.hpp" -#include "mykonos/ad937x_ctrl.hpp" -#include "lmk/lmk04828_spi_iface.hpp" +#include "mpm/net_helper.hpp" +#include "mpm/xbar_iface.hpp" +#include "mpm/udev_helper.hpp" +#include "mpm/mykonos/ad937x_ctrl.hpp" +#include "mpm/lmk04828//lmk04828_spi_iface.hpp" //#include "lib_periphs.hpp" //#include "dboards.hpp" #include <boost/noncopyable.hpp> |