From 5850e62262fe7186c29f34df8243dc83556bb10b Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Wed, 7 Nov 2012 12:24:03 +0000 Subject: Attempt to fix problems with local built py caused by own r51976. --- build_files/cmake/Modules/FindPythonLibsUnix.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'build_files') diff --git a/build_files/cmake/Modules/FindPythonLibsUnix.cmake b/build_files/cmake/Modules/FindPythonLibsUnix.cmake index 5418fb00696..a2126af3eeb 100644 --- a/build_files/cmake/Modules/FindPythonLibsUnix.cmake +++ b/build_files/cmake/Modules/FindPythonLibsUnix.cmake @@ -108,6 +108,10 @@ IF((NOT _IS_INC_DEF) OR (NOT _IS_INC_CONF_DEF) OR (NOT _IS_LIB_DEF) OR (NOT _IS_ include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS} include/x86_64-linux-gnu/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS} ) + IF(NOT PYTHON_INCLUDE_CONFIG_DIR AND PYTHON_INCLUDE_DIR) + # Fallback... + SET(PYTHON_INCLUDE_CONFIG_DIR ${PYTHON_INCLUDE_DIR}) + ENDIF() ENDIF() IF(NOT DEFINED PYTHON_LIBRARY) @@ -130,6 +134,10 @@ IF((NOT _IS_INC_DEF) OR (NOT _IS_INC_CONF_DEF) OR (NOT _IS_LIB_DEF) OR (NOT _IS_ PATH_SUFFIXES lib64 lib ) + IF(NOT PYTHON_LIBPATH AND PYTHON_LIBRARY) + # Fallback... + GET_FILENAME_COMPONENT(PYTHON_LIBPATH ${PYTHON_LIBRARY} PATH) + ENDIF() ENDIF() IF(PYTHON_LIBRARY AND PYTHON_LIBPATH AND PYTHON_INCLUDE_DIR AND PYTHON_INCLUDE_CONFIG_DIR) -- cgit v1.2.3