From e8090161522962fff3ef38ea8445f9cfac49cd24 Mon Sep 17 00:00:00 2001 From: Mihai Tudor Panu Date: Mon, 28 Mar 2016 13:37:59 -0700 Subject: [PATCH] cmake: added back PYTHON_VERSION_* when not building docs for install path Signed-off-by: Mihai Tudor Panu --- CMakeLists.txt | 1 - src/CMakeLists.txt | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 132748f7..3a16f667 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,7 +126,6 @@ if (BUILDDOC) string (REPLACE "." ";" PYTHON_VERSION_LIST ${PYTHONLIBS_VERSION_STRING}) list (GET PYTHON_VERSION_LIST 0 PYTHON_VERSION_MAJOR) list (GET PYTHON_VERSION_LIST 1 PYTHON_VERSION_MINOR) - set (SITE_PACKAGES ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/doxy/conf.py.in ${CMAKE_CURRENT_BINARY_DIR}/pydoc/conf.py @ONLY) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/doxy/index.rst ${CMAKE_CURRENT_BINARY_DIR}/pydoc/index.rst COPYONLY) add_custom_target (pydoc ALL diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3f587f08..812d82c7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -174,8 +174,11 @@ if (SWIG_FOUND) if (BUILDSWIGPYTHON) if(NOT PYTHONLIBS_FOUND) find_package (PythonLibs ${PYTHONBUILD_VERSION} REQUIRED) + string (REPLACE "." ";" PYTHON_VERSION_LIST ${PYTHONLIBS_VERSION_STRING}) + list (GET PYTHON_VERSION_LIST 0 PYTHON_VERSION_MAJOR) + list (GET PYTHON_VERSION_LIST 1 PYTHON_VERSION_MINOR) endif() - endif() + endif(BUILDSWIGPYTHON) if (BUILDSWIGNODE) if(NOT NODE_FOUND) find_package(Node)