Commit d604bce7 authored by Alex Merry's avatar Alex Merry
Browse files

Fix finding Python libraries on ArchLinux.

parent 15c9f474
......@@ -5,14 +5,14 @@ set(PYTHONLIBS3_DEFINITIONS ${PYTHONLIBS3_CFLAGS_OTHER})
find_path(PYTHONLIBS3_INCLUDE_DIR Python.h
HINTS ${PYTHONLIBS3_INCLUDEDIR} ${PYTHONLIBS3_INCLUDE_DIRS})
find_library(PYTHONLIBS3_LIBRARY NAMES python3.2m python3.3m python3.4m
find_library(PYTHONLIBS3_LIBRARY NAMES python3.2m python3.3m python3.4m python3.5m
HINTS ${PYTHONLIBS3_LIBDIR} ${PYTHONLIBS3_LIBRARY_DIRS} )
set(PYTHONLIBS3_LIBRARIES ${PYTHONLIBS3_LIBRARY} )
set(PYTHONLIBS3_INCLUDE_DIRS ${PYTHONLIBS3_INCLUDE_DIR} )
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Python3 DEFAULT_MSG
find_package_handle_standard_args(PythonLibs3 DEFAULT_MSG
PYTHONLIBS3_LIBRARY PYTHONLIBS3_INCLUDE_DIR)
mark_as_advanced(PYTHONLIBS3_INCLUDE_DIR PYTHONLIBS3_LIBRARY)
......@@ -54,6 +54,11 @@ set_package_properties(PythonLibs PROPERTIES DESCRIPTION "A powerful dynamic pro
TYPE OPTIONAL
PURPOSE "Backend to use Python 2 with Cantor.")
# If PythonInterp has been found (which it is indirectly by KF5I18n),
# find_package(PythonLibs) will prefer that version over whatever
# version information you pass the find_package call. Set a special
# variable to override that:
set(Python_ADDITIONAL_VERSIONS 2.7)
find_package(PythonLibs 2.7)
set_package_properties(PythonLibs3 PROPERTIES DESCRIPTION "A powerful dynamic programming language."
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment