diff options
| author | Martin Braun <martin.braun@ettus.com> | 2018-01-04 15:40:21 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-01-04 15:41:07 -0800 |
| commit | 8997654efb9040195bc232b063c8a1cd446f7108 (patch) | |
| tree | dec3db85436d1bd08f5571059b273c7be8c05d1c | |
| parent | 46fd41725308e8abcfed4420162eb1cdf83923a3 (diff) | |
| download | uhd-8997654efb9040195bc232b063c8a1cd446f7108.tar.gz uhd-8997654efb9040195bc232b063c8a1cd446f7108.tar.bz2 uhd-8997654efb9040195bc232b063c8a1cd446f7108.zip | |
mpm: cmake: Disable Python 2
Removing Python 2 makes repo management for MPM a lot easier, and it's
2018 after all.
| -rw-r--r-- | mpm/CMakeLists.txt | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/mpm/CMakeLists.txt b/mpm/CMakeLists.txt index 1dbb57e04..f805e4610 100644 --- a/mpm/CMakeLists.txt +++ b/mpm/CMakeLists.txt @@ -36,12 +36,8 @@ MESSAGE(STATUS "") MESSAGE(STATUS "Configuring Boost C++ Libraries...") SET(BOOST_REQUIRED_COMPONENTS system + python3 ) -IF(MPM_PYTHON_VER EQUAL 3) - LIST(APPEND BOOST_REQUIRED_COMPONENTS python3) -ELSE() - LIST(APPEND BOOST_REQUIRED_COMPONENTS python) -ENDIF() IF(MINGW) LIST(APPEND BOOST_REQUIRED_COMPONENTS thread_win32) @@ -78,20 +74,9 @@ MESSAGE(STATUS "Boost libraries: ${Boost_LIBRARIES}") ######################################################################## # Setup Python API ######################################################################## - -SET(MPM_PYTHON_VER 2 CACHE STRING "Python version (2 or 3)") -IF(MPM_PYTHON_VER EQUAL 2) - SET(PYTHON_ADDITIONAL_VERSIONS 2.7) -ELSE() - SET(PYTHON_ADDITIONAL_VERSIONS 3.4 3.5) -ENDIF() -FIND_PACKAGE(PythonInterp ${MPM_PYTHON_VER}) -#IF(MPM_PYTHON_VER EQUAL "2") - #FIND_PACKAGE(PythonInterp) -#ELSE() - #FIND_PACKAGE(PythonInterp 3) -#ENDIF() -FIND_PACKAGE(PythonLibs ${MPM_PYTHON_VER}) +SET(PYTHON_ADDITIONAL_VERSIONS 3.4 3.5) +FIND_PACKAGE(PythonInterp 3) +FIND_PACKAGE(PythonLibs 3) ######################################################################## # Install Dirs |