Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improvements to Python support. #695

Merged
merged 1 commit into from
Dec 10, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions bindings/python/setup.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ cfg_vars["CFLAGS"] = " ".join( flag for flag in cflags.split() if flag not in ['
py_cflags = cfg_vars["PY_CFLAGS"]
cfg_vars["PY_CFLAGS"] = " ".join( flag for flag in py_cflags.split() if flag not in ['-Wstrict-prototypes' ${CLANG_PROHIBITED} ] )

ccl=cfg_vars["CC"].split()
ccl[0]="${CMAKE_C_COMPILER}"
cfg_vars["CC"] = " ".join(ccl)
cxxl=cfg_vars["CXX"].split()
cxxl[0]="${CMAKE_CXX_COMPILER}"
cfg_vars["CXX"] = " ".join(cxxl)
cfg_vars["PY_CXXFLAGS"] = "${CMAKE_CXX_FLAGS}"

sources = list()
depends = list()
Expand Down
2 changes: 1 addition & 1 deletion cmake/XRootDFindLibs.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ if( ENABLE_CEPH )
endif()

if( ENABLE_PYTHON AND (Linux OR APPLE) )
find_package( PythonLibs ${XRD_PYTHON_REQ_VERSION} )
find_package( PythonInterp ${XRD_PYTHON_REQ_VERSION} )
find_package( PythonLibs ${XRD_PYTHON_REQ_VERSION} )
if( PYTHONINTERP_FOUND AND PYTHONLIBS_FOUND )
set( BUILD_PYTHON TRUE )
set( PYTHON_FOUND TRUE )
Expand Down