diff options
| author | Trung Tran <trung.tran@ettus.com> | 2018-04-17 05:42:19 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-04-17 09:24:35 -0700 |
| commit | 3ccd06f6ba0c23e80d5e7d2b1796693cd6004baa (patch) | |
| tree | 6b03d679b833a2e5aa99e14846c67a7a84715090 | |
| parent | 002cec940c7d8c373ab7062c0abdc4b38e23a10c (diff) | |
| download | uhd-3ccd06f6ba0c23e80d5e7d2b1796693cd6004baa.tar.gz uhd-3ccd06f6ba0c23e80d5e7d2b1796693cd6004baa.tar.bz2 uhd-3ccd06f6ba0c23e80d5e7d2b1796693cd6004baa.zip | |
mpm: update cmake to find the correct python3
We need to set it before including UHDPython.cmake where PythonInterp is set without
version requirement.
Reviewed-by: Martin Braun <martin.braun@ettus.com>
| -rw-r--r-- | mpm/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mpm/CMakeLists.txt b/mpm/CMakeLists.txt index 85f1dd49b..8129f3eff 100644 --- a/mpm/CMakeLists.txt +++ b/mpm/CMakeLists.txt @@ -18,6 +18,12 @@ ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) LIST(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/Modules) SET(UHD_HOST_ROOT ${CMAKE_SOURCE_DIR}/../host) +######################################################################## +# Setup Python API +######################################################################## +SET(PYTHON_ADDITIONAL_VERSIONS 3.4 3.5) +FIND_PACKAGE(PythonInterp 3 REQUIRED) +FIND_PACKAGE(PythonLibs 3 REQUIRED) # Now, we can also include CMake modules from UHD: LIST(INSERT CMAKE_MODULE_PATH 0 ${UHD_HOST_ROOT}/cmake/Modules) @@ -91,12 +97,6 @@ MESSAGE(STATUS "Boost include directories: ${Boost_INCLUDE_DIRS}") MESSAGE(STATUS "Boost library directories: ${Boost_LIBRARY_DIRS}") MESSAGE(STATUS "Boost libraries: ${Boost_LIBRARIES}") -######################################################################## -# Setup Python API -######################################################################## -SET(PYTHON_ADDITIONAL_VERSIONS 3.4 3.5) -FIND_PACKAGE(PythonInterp 3) -FIND_PACKAGE(PythonLibs 3) ######################################################################## # Install Dirs |