alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-15 04:57:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

upm: remove flag setting, move node to target only

Browse Source 
* Fixes issue with swig and sysroots

Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>
This commit is contained in:
Thomas Ingleby 2014-08-18 15:56:38 +01:00
parent 050c134664
commit 428f4e5bfc
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/CMakeLists.txt
View File

@ -17,7 +17,6 @@ endmacro (upm_CREATE_INSTALL_PKGCONFIG)
macro(upm_SWIG_PYTHON) macro(upm_SWIG_PYTHON)
if (BUILDSWIGPYTHON AND BUILDSWIG) if (BUILDSWIGPYTHON AND BUILDSWIG)
set (CMAKE_C_FLAGS -DSWIGPYTHON=${SWIG_FOUND})
set_source_files_properties (pyupm_${libname}.i PROPERTIES CPLUSPLUS ON) set_source_files_properties (pyupm_${libname}.i PROPERTIES CPLUSPLUS ON)
swig_add_module (pyupm_${libname} python pyupm_${libname}.i ${module_src}) swig_add_module (pyupm_${libname} python pyupm_${libname}.i ${module_src})
swig_link_libraries (pyupm_${libname} ${PYTHON_LIBRARIES} ${MRAA_LIBRARIES}) swig_link_libraries (pyupm_${libname} ${PYTHON_LIBRARIES} ${MRAA_LIBRARIES})
@ -35,7 +34,6 @@ endmacro()
macro(upm_SWIG_NODE) macro(upm_SWIG_NODE)
if (BUILDSWIGNODE AND BUILDSWIG) if (BUILDSWIGNODE AND BUILDSWIG)
set (CMAKE_CXX_FLAGS -DBUILDING_NODE_EXTENSION)
set_source_files_properties (jsupm_${libname}.i PROPERTIES CPLUSPLUS ON) set_source_files_properties (jsupm_${libname}.i PROPERTIES CPLUSPLUS ON)
set_source_files_properties (jsupm_${libname}.i PROPERTIES SWIG_FLAGS "-node") set_source_files_properties (jsupm_${libname}.i PROPERTIES SWIG_FLAGS "-node")
swig_add_module (jsupm_${libname} javascript jsupm_${libname}.i ${module_src}) swig_add_module (jsupm_${libname} javascript jsupm_${libname}.i ${module_src})
@ -45,6 +43,7 @@ macro(upm_SWIG_NODE)
"${NODE_INCLUDE_DIRS}" "${NODE_INCLUDE_DIRS}"
) )
set_target_properties (jsupm_${libname} PROPERTIES set_target_properties (jsupm_${libname} PROPERTIES
COMPILE_FLAGS "${CMAKE_CXX_FLAGS} -DBUILDING_NODE_EXTENSION"
PREFIX "" PREFIX ""
SUFFIX ".node" SUFFIX ".node"
) )