alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-24 01:10:22 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: Fix for cmake < 3.0.0 swig python bindings.

Browse Source 
There is a bug in the UseSWIG.cmake file for cmake < 3.0.0
where it does not use the SWIG outdir correctly.

This fix instead sets the CMAKE_CURRENT_BINARY_DIR which is used
by UseSWIG.cmake to place the wrapper file (and other collateral).

Before (w/cmake < 3):

    build/src/dfrph/pyupm_dfrphPYTHON_wrap.cxx

After:

    build/src/dfrph/python2.7/pyupm_dfrphPYTHON_wrap.cxx

Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Noel Eck 2016-10-21 12:27:05 -07:00
parent 3cec185d91
commit 7e0862cecc
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/CMakeLists.txt
View File

@ -67,10 +67,11 @@ macro(_upm_swig_python)
${CMAKE_CURRENT_BINARY_DIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) ${CMAKE_CURRENT_BINARY_DIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
# Make sure swig places wrapper/.py collateral under python2/3 directory # Make sure swig places wrapper/.py collateral under python2/3 directory
# Do do this, save the original outdir, set a new outdir, then restore at the # Save the original BINARY_DIR, set a new BINARY_DIR, then restore at
# end of this macro. # the end of this macro. This works for cmake > 3 and works AROUND a bug in
set(CMAKE_SWIG_OUTDIR_SAVED ${CMAKE_SWIG_OUTDIR}) # cmake < 3 (#13173,#13772,#14459).
set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_PYTHON_BINARY_DIR}) set(CMAKE_CURRENT_BINARY_DIR_SAVED ${CMAKE_CURRENT_BINARY_DIR})
set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_PYTHON_BINARY_DIR})
# Swig module name (example: pyupm_a110x-python2) # Swig module name (example: pyupm_a110x-python2)
set (python_wrapper_name pyupm_${libname}-python${PYTHON_VERSION_MAJOR}) set (python_wrapper_name pyupm_${libname}-python${PYTHON_VERSION_MAJOR})
@ -100,7 +101,7 @@ macro(_upm_swig_python)
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_PYTHON_BINARY_DIR}) LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_PYTHON_BINARY_DIR})
# Install .py's to python packages directory/upm # Install .py's to python packages directory/upm
install (FILES ${CMAKE_SWIG_OUTDIR}/pyupm_${libname}.py install (FILES ${swig_extra_generated_files}
DESTINATION ${PYTHON_PACKAGES_PATH}/upm DESTINATION ${PYTHON_PACKAGES_PATH}/upm
COMPONENT ${libname}) COMPONENT ${libname})
@ -108,8 +109,8 @@ macro(_upm_swig_python)
install (TARGETS ${python_wrapper_target} install (TARGETS ${python_wrapper_target}
DESTINATION ${PYTHON_PACKAGES_PATH}/upm) DESTINATION ${PYTHON_PACKAGES_PATH}/upm)
# Restore OUTDIR # Restore CMAKE_CURRENT_BINARY_DIR
set(CMAKE_SWIG_OUTDIR ${CMAKE_SWIG_OUTDIR_SAVED}) set(CMAKE_CURRENT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR_SAVED})
endmacro(_upm_swig_python) endmacro(_upm_swig_python)
# Generate both python2 and python3 modules if possible # Generate both python2 and python3 modules if possible