diff --git a/CMakeLists.txt b/CMakeLists.txt index 7908ca776..a22596b1b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.12.0) +cmake_minimum_required(VERSION 3.0.2) set(catkin_EXTRAS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/cmake) diff --git a/cmake/python.cmake b/cmake/python.cmake index 140c90913a19..c72b85999 100644 --- a/cmake/python.cmake +++ b/cmake/python.cmake @@ -1,13 +1,7 @@ # the CMake variable PYTHON_INSTALL_DIR has the same value as the Python function catkin.builder.get_python_install_dir() set(PYTHON_VERSION "$ENV{ROS_PYTHON_VERSION}" CACHE STRING "Specify specific Python version to use ('major.minor' or 'major')") -find_package(Python ${PYTHON_VERSION} REQUIRED) - -# Set these legacy variables for compatibility with what PythonInterp used to do -set(PYTHON_EXECUTABLE ${Python_EXECUTABLE}) -set(PYTHON_VERSION_MAJOR ${Python_VERSION_MAJOR}) -set(PYTHON_VERSION_MINOR ${Python_VERSION_MINOR}) -set(PYTHON_VERSION_PATCH ${Python_VERSION_PATCH}) +find_package(PythonInterp ${PYTHON_VERSION} REQUIRED) message(STATUS "Using PYTHON_EXECUTABLE: ${PYTHON_EXECUTABLE}")