Commit 59826d38 authored by Jeremy Cohen's avatar Jeremy Cohen

Fixed setting of boost python library name to resolve linking issues.

parent 5f6f711e
......@@ -145,7 +145,12 @@ else()
# Probably this needs to be more involved. It would be nice if the config
# information the python interpreter itself gave us were more complete.
find_library(PYTHON_LIBRARY
NAMES "python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}"
NAMES
python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}
python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}mu
python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}m
python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}u
python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}
PATHS ${_PYTHON_LIBS_SEARCH}
NO_SYSTEM_ENVIRONMENT_PATH)
endif()
......@@ -185,7 +190,6 @@ find_package_message(PYTHON
"Found PythonLibs: ${PYTHON_LIBRARY}"
"${PYTHON_EXECUTABLE}${PYTHON_VERSION}")
# PYTHON_ADD_MODULE(<name> src1 src2 ... srcN) is used to build modules for python.
FUNCTION(PYTHON_ADD_MODULE _NAME )
GET_PROPERTY(_TARGET_SUPPORTS_SHARED_LIBS
......
......@@ -56,6 +56,7 @@ IF (NEKTAR_BUILD_PYTHON)
STRING(TOUPPER ${BPLIB} BPLIB_UPPER)
IF (Boost_${BPLIB_UPPER}_FOUND)
SET(Boost_PYTHON_LIBRARY ${Boost_${BPLIB_UPPER}_LIBRARY})
break()
ENDIF()
ENDFOREACH()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment