← Back to branch summary

~telepathy-kde/telepathy-kde/telepathy-logger-qt

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: Alexander Akulich
  • Date: 2019-10-03 20:28:29 UTC
  • Revision ID: git-v1:cae0e0254e88899e83bc707a6caf69e7b414aa46
CMake: Remove own FindPython modules, use standard FindPython3 instead

Summary:
- Do not rename PYTHON_EXECUTABLE variable to give a room for Python4 update.

This revision depends on D24065.

Test Plan: Configure and build in a clean environment.

Reviewers: #kde_telepathy, davidedmundson, apol, heikobecker

Reviewed By: apol, heikobecker

Tags: #kde_telepathy

Differential Revision: https://phabricator.kde.org/D24066

Show diffs side-by-side

added added

removed removed

Lines of Context:
CMakeLists.txt
78
78
                       URL "http://telepathy.freedesktop.org"
79
79
                       TYPE REQUIRED)
80
80
 
81
 
# Find python version >= 2.5
82
 
find_package(PythonLibrary REQUIRED)
83
 
set(REQUIRED_PY 2.5)
84
 
if(${PYTHON_SHORT_VERSION} VERSION_GREATER ${REQUIRED_PY} OR ${PYTHON_SHORT_VERSION} VERSION_EQUAL ${REQUIRED_PY})
85
 
    message(STATUS "Python ${PYTHON_SHORT_VERSION} found")
86
 
else(${PYTHON_SHORT_VERSION} VERSION_GREATER ${REQUIRED_PY} OR ${PYTHON_SHORT_VERSION} VERSION_EQUAL ${REQUIRED_PY})
87
 
    message(SEND_ERROR "Python >= ${REQUIRED_PY} is required")
88
 
endif(${PYTHON_SHORT_VERSION} VERSION_GREATER ${REQUIRED_PY} OR ${PYTHON_SHORT_VERSION} VERSION_EQUAL ${REQUIRED_PY})
89
 
set_package_properties(PythonLibrary PROPERTIES
90
 
                       DESCRIPTION "Python Library"
91
 
                       URL "http://www.python.org"
92
 
                       TYPE REQUIRED)
 
81
# Find python
 
82
if(${CMAKE_VERSION} VERSION_LESS 3.12)
 
83
    find_package(PythonInterp 3 REQUIRED)
 
84
    set_package_properties(PythonInterp PROPERTIES
 
85
                           DESCRIPTION "Python Interpreter"
 
86
                           URL "http://www.python.org"
 
87
                           TYPE REQUIRED)
 
88
 
 
89
    # PythonInterp exposes PYTHON_EXECUTABLE on its own
 
90
else()
 
91
    find_package(Python3 REQUIRED)
 
92
    set_package_properties(Python3 PROPERTIES
 
93
                           DESCRIPTION "Python Interpreter"
 
94
                           URL "http://www.python.org"
 
95
                           TYPE REQUIRED)
 
96
    set(PYTHON_EXECUTABLE "${Python3_EXECUTABLE}")
 
97
endif()
93
98
 
94
99
# Find TelepathyLogger >= 0.8.0
95
100
set(TELEPATHY_LOGGER_MIN_VERSION 0.8.0)