Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Popov <v.popov@corp.mail.ru>2019-01-08 14:37:16 +0300
committerSergey Yershov <syershov@maps.me>2019-01-09 14:26:30 +0300
commit10e9614012cb96ea3de9e1528d651c6005193f4c (patch)
treef226398dc658a383f402db32ef65f998fe4eb73d
parent1f2bc65f3aa2b14f827854fc66923c203ab81cfc (diff)
Add overridable boost_python library namepy-modules-0.2.6
This would be needed for updating boost to 1.67 or later - the python bindings libraries changed their names to contain python version they are built against. Also this naming change is backported to our boost packages on linux.
-rw-r--r--CMakeLists.txt9
1 files changed, 7 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7210d85a0..e3ecb6b979 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -165,10 +165,15 @@ endif()
if (PYBINDINGS)
if (PYTHON_VERSION VERSION_GREATER 3.0)
set(_Boost_PYTHON3_HEADERS "boost/python.hpp")
- find_package(Boost 1.64 REQUIRED COMPONENTS python3)
+ if (NOT DEFINED BOOST_PYTHON_LIBNAME)
+ set(BOOST_PYTHON_LIBNAME python3)
+ endif()
else()
- find_package(Boost 1.64 REQUIRED COMPONENTS python)
+ if (NOT DEFINED BOOST_PYTHON_LIBNAME)
+ set(BOOST_PYTHON_LIBNAME python)
+ endif()
endif()
+ find_package(Boost 1.64 REQUIRED COMPONENTS ${BOOST_PYTHON_LIBNAME})
find_package(PythonLibs ${PYTHON_VERSION} REQUIRED)
include_directories(${PYTHON_INCLUDE_DIRS})
endif()