telepathy-qt: CMake: Remove own FindPython modules

Alexandr Akulich kaffeine at kemper.freedesktop.org
Mon Oct 14 21:25:17 UTC 2019


Module: telepathy-qt
Branch: master
Commit: 4a7951b480b9e777c550d11b6c36424bd4009c5c
URL:    http://cgit.freedesktop.org/telepathy/telepathy-qt/commit/?id=4a7951b480b9e777c550d11b6c36424bd4009c5c

Author: Alexander Akulich <akulichalexander at gmail.com>
Date:   Thu Sep 19 00:52:44 2019 +0300

CMake: Remove own FindPython modules

---

 cmake/modules/FindLibPython.py        | 12 -----
 cmake/modules/FindPythonLibrary.cmake | 85 -----------------------------------
 2 files changed, 97 deletions(-)

diff --git a/cmake/modules/FindLibPython.py b/cmake/modules/FindLibPython.py
deleted file mode 100644
index 0cbd53c5..00000000
--- a/cmake/modules/FindLibPython.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright (c) 2007, Simon Edwards <simon at simonzone.com>
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-import sys
-import distutils.sysconfig
-
-print("exec_prefix:%s" % sys.exec_prefix)
-print("short_version:%s" % sys.version[:3])
-print("long_version:%s" % sys.version.split()[0])
-print("py_inc_dir:%s" % distutils.sysconfig.get_python_inc())
-print("site_packages_dir:%s" % distutils.sysconfig.get_python_lib(plat_specific=1))
diff --git a/cmake/modules/FindPythonLibrary.cmake b/cmake/modules/FindPythonLibrary.cmake
deleted file mode 100644
index 3c64dab5..00000000
--- a/cmake/modules/FindPythonLibrary.cmake
+++ /dev/null
@@ -1,85 +0,0 @@
-# FindPythonLibrary.cmake
-# ~~~~~~~~~~~~~~~~~~~~~~~
-# Find the Python interpreter and related Python directories.
-#
-# This file defines the following variables:
-# 
-# PYTHON_EXECUTABLE - The path and filename of the Python interpreter.
-#
-# PYTHON_SHORT_VERSION - The version of the Python interpreter found,
-#     excluding the patch version number. (e.g. 2.5 and not 2.5.1))
-# 
-# PYTHON_LONG_VERSION - The version of the Python interpreter found as a human
-#     readable string.
-#
-# PYTHON_SITE_PACKAGES_DIR - Location of the Python site-packages directory.
-#
-# PYTHON_INCLUDE_PATH - Directory holding the python.h include file.
-#
-# PYTHON_LIBRARY, PYTHON_LIBRARIES- Location of the Python library.
-
-# Copyright (c) 2007, Simon Edwards <simon at simonzone.com>
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-INCLUDE(CMakeFindFrameworks)
-
-if(EXISTS PYTHON_LIBRARY)
-  # Already in cache, be silent
-  set(PYTHONLIBRARY_FOUND TRUE)
-else()
-  message(STATUS "PythonLibrary find version: ${PythonLibrary_FIND_VERSION}")
-  FIND_PACKAGE(PythonInterp ${PythonLibrary_FIND_VERSION} QUIET)
-
-  if(PYTHONINTERP_FOUND)
-    FIND_FILE(_find_lib_python_py FindLibPython.py PATHS ${CMAKE_MODULE_PATH})
-
-    EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_lib_python_py} OUTPUT_VARIABLE python_config)
-    if(python_config)
-      STRING(REGEX REPLACE ".*exec_prefix:([^\n]+).*$" "\\1" PYTHON_PREFIX ${python_config})
-      STRING(REGEX REPLACE ".*\nshort_version:([^\n]+).*$" "\\1" PYTHON_SHORT_VERSION ${python_config})
-      STRING(REGEX REPLACE ".*\nlong_version:([^\n]+).*$" "\\1" PYTHON_LONG_VERSION ${python_config})
-      STRING(REGEX REPLACE ".*\npy_inc_dir:([^\n]+).*$" "\\1" PYTHON_INCLUDE_PATH ${python_config})
-      STRING(REGEX REPLACE ".*\nsite_packages_dir:([^\n]+).*$" "\\1" PYTHON_SITE_PACKAGES_DIR ${python_config})
-      STRING(REGEX REPLACE "([0-9]+).([0-9]+)" "\\1\\2" PYTHON_SHORT_VERSION_NO_DOT ${PYTHON_SHORT_VERSION})
-      set(PYTHON_LIBRARY_NAMES python${PYTHON_SHORT_VERSION} python${PYTHON_SHORT_VERSION_NO_DOT})
-      if(WIN32)
-          STRING(REPLACE "\\" "/" PYTHON_SITE_PACKAGES_DIR ${PYTHON_SITE_PACKAGES_DIR})
-      endif()
-      FIND_LIBRARY(PYTHON_LIBRARY NAMES ${PYTHON_LIBRARY_NAMES} PATHS ${PYTHON_PREFIX}/lib ${PYTHON_PREFIX}/libs NO_DEFAULT_PATH)
-      set(PYTHONLIBRARY_FOUND TRUE)
-    endif()
-
-    # adapted from cmake's builtin FindPythonLibs
-    if(APPLE)
-      CMAKE_FIND_FRAMEWORKS(Python)
-      set(PYTHON_FRAMEWORK_INCLUDES)
-      if(Python_FRAMEWORKS)
-        # If a framework has been selected for the include path,
-        # make sure "-framework" is used to link it.
-        if("${PYTHON_INCLUDE_PATH}" MATCHES "Python\\.framework")
-          set(PYTHON_LIBRARY "")
-          set(PYTHON_DEBUG_LIBRARY "")
-        endif()
-        if(NOT PYTHON_LIBRARY)
-          set (PYTHON_LIBRARY "-framework Python" CACHE FILEPATH "Python Framework" FORCE)
-        endif()
-        set(PYTHONLIBRARY_FOUND TRUE)
-      endif()
-    endif()
-
-  endif()
-
-  if(PYTHONLIBRARY_FOUND)
-    set(PYTHON_LIBRARIES ${PYTHON_LIBRARY})
-    if(NOT PYTHONLIBRARY_FIND_QUIETLY)
-      message(STATUS "Found Python executable: ${PYTHON_EXECUTABLE}")
-      message(STATUS "Found Python version: ${PYTHON_LONG_VERSION}")
-    endif()
-  else()
-    if(PYTHONLIBRARY_FIND_REQUIRED)
-      message(FATAL_ERROR "Could not find Python")
-    endif()
-  endif()
-
-endif()



More information about the telepathy-commits mailing list