From 336b93aefb658665dbcbb3b6852964c5fa2ed8a6 Mon Sep 17 00:00:00 2001 From: Joost van Amersfoort Date: Fri, 7 Apr 2017 12:39:32 +0100 Subject: [PATCH 1/2] Add support for Python3.6 lib search with Cmake A recent commit added support for python3.5 lib search with Cmake. This PR extends that to python 3.6. Relevant old commit: https://github.com/davisking/dlib/commit/17a2c75ddffb13e915686803c5e3bf4cc1389a96 --- dlib/cmake_utils/add_python_module | 1 + 1 file changed, 1 insertion(+) diff --git a/dlib/cmake_utils/add_python_module b/dlib/cmake_utils/add_python_module index 2059af7e45..24846ed447 100644 --- a/dlib/cmake_utils/add_python_module +++ b/dlib/cmake_utils/add_python_module @@ -69,6 +69,7 @@ if (PYTHON3) FIND_PACKAGE(Boost 1.41.0 COMPONENTS python) endif() set(Python_ADDITIONAL_VERSIONS 3.5) + set(Python_ADDITIONAL_VERSIONS 3.6) FIND_PACKAGE(PythonLibs 3.4 REQUIRED) else() FIND_PACKAGE(Boost 1.41.0 COMPONENTS python) From 03502626dd84bdab9de2e3cff8be96f2c631fb9d Mon Sep 17 00:00:00 2001 From: Joost van Amersfoort Date: Fri, 7 Apr 2017 15:18:05 +0100 Subject: [PATCH 2/2] Turn python versions into a list --- dlib/cmake_utils/add_python_module | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlib/cmake_utils/add_python_module b/dlib/cmake_utils/add_python_module index 24846ed447..bb6c318937 100644 --- a/dlib/cmake_utils/add_python_module +++ b/dlib/cmake_utils/add_python_module @@ -68,8 +68,7 @@ if (PYTHON3) if (NOT Boost_FOUND) FIND_PACKAGE(Boost 1.41.0 COMPONENTS python) endif() - set(Python_ADDITIONAL_VERSIONS 3.5) - set(Python_ADDITIONAL_VERSIONS 3.6) + set(Python_ADDITIONAL_VERSIONS 3.5 3.6) FIND_PACKAGE(PythonLibs 3.4 REQUIRED) else() FIND_PACKAGE(Boost 1.41.0 COMPONENTS python)