diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2012-11-07 16:24:03 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2012-11-07 16:24:03 +0400 |
| commit | 5850e62262fe7186c29f34df8243dc83556bb10b (patch) | |
| tree | 1ae05c1824a3d61a7f2dd34235df3483cd0dd64c /build_files | |
| parent | d8443cdfb088fe477f4ed73e4d4a8aeb055ab5c3 (diff) | |
Attempt to fix problems with local built py caused by own r51976.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/Modules/FindPythonLibsUnix.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
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) |