From a97192e6e983380cb54bf5f7d304b80e79ed0466 Mon Sep 17 00:00:00 2001 From: Chris Green Date: Thu, 26 Apr 2018 13:37:00 -0500 Subject: [PATCH] Improvements to Python support. - Correct configuration flags reflecting C / C++ flags. - Improve ordering of python component location. --- bindings/python/setup.py.in | 7 +++++++ cmake/XRootDFindLibs.cmake | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/bindings/python/setup.py.in b/bindings/python/setup.py.in index 8c7d72bfa40..63aeeba6248 100644 --- a/bindings/python/setup.py.in +++ b/bindings/python/setup.py.in @@ -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() diff --git a/cmake/XRootDFindLibs.cmake b/cmake/XRootDFindLibs.cmake index b1e23550446..4091da21dc4 100644 --- a/cmake/XRootDFindLibs.cmake +++ b/cmake/XRootDFindLibs.cmake @@ -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 )