diff options
| author | Martin Braun <martin.braun@ettus.com> | 2017-05-31 18:18:57 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-12-22 15:03:58 -0800 |
| commit | d16d342be2dee7fef1f798349eba211cce0f27f9 (patch) | |
| tree | ab213207ea53754550add6542613cf353ff1c2b5 | |
| parent | 3aa899e1f5a1e3b7c9e69ccdd19aeb3fe2ffd672 (diff) | |
| download | uhd-d16d342be2dee7fef1f798349eba211cce0f27f9.tar.gz uhd-d16d342be2dee7fef1f798349eba211cce0f27f9.tar.bz2 uhd-d16d342be2dee7fef1f798349eba211cce0f27f9.zip | |
mpm: Made CMake more future-proof w.r.t. newer Boost and Python
| -rw-r--r-- | mpm/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | mpm/python/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mpm/CMakeLists.txt b/mpm/CMakeLists.txt index 5d89e40f3..8a11464bc 100644 --- a/mpm/CMakeLists.txt +++ b/mpm/CMakeLists.txt @@ -53,9 +53,8 @@ IF(MSVC) 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" + "1.56.0" "1.56" "1.57" "1.57" "1.58" "1.59" "1.60" "1.61" "1.62" "1.63" + "1.64" ) FIND_PACKAGE(Boost 1.53 COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) diff --git a/mpm/python/CMakeLists.txt b/mpm/python/CMakeLists.txt index 11adef92a..4f2aeb20f 100644 --- a/mpm/python/CMakeLists.txt +++ b/mpm/python/CMakeLists.txt @@ -89,7 +89,7 @@ ADD_CUSTOM_COMMAND(OUTPUT ${OUTPUT} ADD_CUSTOM_TARGET(usrp_mpm ALL DEPENDS ${OUTPUT} pyusrp_periphs) EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c - "from distutils import sysconfig; print sysconfig.get_python_lib(plat_specific=True, prefix='')" + "from __future__ import print_function; from distutils import sysconfig; print(sysconfig.get_python_lib(plat_specific=True, prefix=''))" OUTPUT_VARIABLE USRP_MPM_PYTHON_DIR OUTPUT_STRIP_TRAILING_WHITESPACE ) INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build/lib/usrp_mpm DESTINATION ${CMAKE_INSTALL_PREFIX}/${USRP_MPM_PYTHON_DIR}) |