From 9b0702c546d10530af34deb7ab25391b7a7db87e Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Tue, 19 Mar 2019 14:14:44 -0700
Subject: cmake: Bump dependency versions for UHD 4.0.0.0

- Boost >= 1.58
- CMake >= 3.5.1
- gcc >= 5.4.0
- Clang >= 3.8, AppleClang >= 600
- Python >= 3.5 (Py2k no longer supported)
- Numpy >= 1.11
- C++14 for lib, include may now use C++11 constructs.
  - Because there is no more code requiring C++03 syntax, we remove the
    include-specific clang-format file
---
 host/cmake/Modules/UHDPython.cmake  | 32 ++------------------------------
 host/cmake/Modules/UHDVersion.cmake |  4 ++--
 2 files changed, 4 insertions(+), 32 deletions(-)

(limited to 'host/cmake/Modules')

diff --git a/host/cmake/Modules/UHDPython.cmake b/host/cmake/Modules/UHDPython.cmake
index a93761131..d3fac6100 100644
--- a/host/cmake/Modules/UHDPython.cmake
+++ b/host/cmake/Modules/UHDPython.cmake
@@ -19,12 +19,9 @@ if(PYTHON_EXECUTABLE)
     set(PYTHONINTERP_FOUND TRUE)
 endif(PYTHON_EXECUTABLE)
 
-# We always try to find Py3k first. Once we only support Py3k we can remove
-# most of this.
 if(NOT PYTHONINTERP_FOUND)
-    find_package(Python3 ${PYTHON3_MIN_VERSION} QUIET)
+    find_package(Python3 ${PYTHON_MIN_VERSION} QUIET)
     if(Python3_Interpreter_FOUND)
-        set(PYTHON_MIN_VERSION ${PYTHON3_MIN_VERSION})
         set(PYTHON_VERSION ${Python3_VERSION})
         set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
         set(PYTHONINTERP_FOUND TRUE)
@@ -32,41 +29,16 @@ if(NOT PYTHONINTERP_FOUND)
 endif(NOT PYTHONINTERP_FOUND)
 
 if(NOT PYTHONINTERP_FOUND)
-    find_package(PythonInterp ${PYTHON3_MIN_VERSION} QUIET)
+    find_package(PythonInterp ${PYTHON_MIN_VERSION} QUIET)
     if(PYTHONINTERP_FOUND)
-        set(PYTHON_MIN_VERSION ${PYTHON3_MIN_VERSION})
         set(PYTHON_VERSION ${PYTHON_VERSION_STRING})
     endif(PYTHONINTERP_FOUND)
 endif(NOT PYTHONINTERP_FOUND)
 
-# Next, try and find Py2k.
-if(NOT PYTHONINTERP_FOUND)
-    find_package(Python2 ${PYTHON_MIN_VERSION} QUIET)
-    if(Python2_Interpreter_FOUND)
-        set(PYTHON_VERSION ${Python2_VERSION})
-        set(PYTHON_EXECUTABLE ${Python2_EXECUTABLE})
-        set(PYTHONINTERP_FOUND TRUE)
-    endif(Python2_Interpreter_FOUND)
-endif(NOT PYTHONINTERP_FOUND)
-
-if(NOT PYTHONINTERP_FOUND)
-    find_package(PythonInterp ${PYTHON_MIN_VERSION} QUIET)
-    set(PYTHON_VERSION ${PYTHON_VERSION_STRING})
-endif(NOT PYTHONINTERP_FOUND)
-
 # If that fails, try using the build-in find program routine.
 if(NOT PYTHONINTERP_FOUND)
     message(STATUS "Attempting to find Python without CMake...")
     find_program(PYTHON_EXECUTABLE NAMES python3 python3.5 python3.6 python3.7 python3.8)
-    if(PYTHON_EXECUTABLE)
-        set(PYTHONINTERP_FOUND TRUE)
-        set(PYTHON_MIN_VERSION ${PYTHON3_MIN_VERSION})
-    endif(PYTHON_EXECUTABLE)
-endif(NOT PYTHONINTERP_FOUND)
-
-if(NOT PYTHONINTERP_FOUND)
-    message(STATUS "Attempting to find Python without CMake...")
-    find_program(PYTHON_EXECUTABLE NAMES python2 python2.7)
     if(PYTHON_EXECUTABLE)
         set(PYTHONINTERP_FOUND TRUE)
     endif(PYTHON_EXECUTABLE)
diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake
index 99e898649..cf2767a1a 100644
--- a/host/cmake/Modules/UHDVersion.cmake
+++ b/host/cmake/Modules/UHDVersion.cmake
@@ -17,8 +17,8 @@ find_package(Git QUIET)
 #  - Increment patch for bugfixes and docs
 #  - set UHD_VERSION_DEVEL to true for master and development branches
 ########################################################################
-set(UHD_VERSION_MAJOR 3)
-set(UHD_VERSION_API   15)
+set(UHD_VERSION_MAJOR 4)
+set(UHD_VERSION_API   0)
 set(UHD_VERSION_ABI   0)
 set(UHD_VERSION_PATCH 0)
 set(UHD_VERSION_DEVEL FALSE)
-- 
cgit v1.2.3