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: Add parent directory to include path for UPM modules

Browse Source 
This avoids using include files from a pre-existing UPM installation
as they can break the build if API changes are made.

Signed-off-by: Henry Bruce <henry.bruce@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Henry Bruce 2016-03-29 10:28:22 -07:00 committed by Mihai Tudor Panu
parent ba127ec4d4
commit 0e365590c4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/CMakeLists.txt
View File

@ -28,7 +28,7 @@ endmacro (upm_CREATE_INSTALL_PKGCONFIG)
macro(upm_SWIG_PYTHON) macro(upm_SWIG_PYTHON)
if (BUILDSWIGPYTHON AND BUILDSWIG) if (BUILDSWIGPYTHON AND BUILDSWIG)
set_source_files_properties (pyupm_${libname}.i PROPERTIES CPLUSPLUS ON) set_source_files_properties (pyupm_${libname}.i PROPERTIES CPLUSPLUS ON)
set_source_files_properties (pyupm_${libname}.i PROPERTIES SWIG_FLAGS "-I${CMAKE_CURRENT_BINARY_DIR}/..") set_source_files_properties (pyupm_${libname}.i PROPERTIES SWIG_FLAGS "-I${CMAKE_CURRENT_BINARY_DIR}/..")
swig_add_module (pyupm_${libname} python pyupm_${libname}.i ${module_src}) swig_add_module (pyupm_${libname} python pyupm_${libname}.i ${module_src})
@ -57,7 +57,7 @@ macro(upm_SWIG_NODE)
set (V8_VERSION_HEX "${V8_VERSION_HEX}0") set (V8_VERSION_HEX "${V8_VERSION_HEX}0")
string (LENGTH "${V8_VERSION_HEX}" V8_VERSION_HEX_length) string (LENGTH "${V8_VERSION_HEX}" V8_VERSION_HEX_length)
endwhile () endwhile ()
# include_directories (${NODE_INCLUDE_DIRS}) # include_directories (${NODE_INCLUDE_DIRS})
include_directories ( include_directories (
@ -84,7 +84,7 @@ macro(upm_SWIG_NODE)
message(FATAL_ERROR " **ERROR** GCC 4.7 or above is required to compile jsupm_${libname} ") message(FATAL_ERROR " **ERROR** GCC 4.7 or above is required to compile jsupm_${libname} ")
endif() endif()
endif() endif()
if (NOT ENABLECXX11) if (NOT ENABLECXX11)
set_property (TARGET jsupm_${libname} PROPERTY CXX_STANDARD 11) set_property (TARGET jsupm_${libname} PROPERTY CXX_STANDARD 11)
set_property (TARGET jsupm_${libname} PROPERTY CXX_STANDARD_REQUIRED ON) set_property (TARGET jsupm_${libname} PROPERTY CXX_STANDARD_REQUIRED ON)
@ -220,7 +220,7 @@ macro(upm_module_init)
foreach (linkflag ${ARGN}) foreach (linkflag ${ARGN})
target_link_libraries (${libname} ${linkflag}) target_link_libraries (${libname} ${linkflag})
endforeach () endforeach ()
include_directories (${MRAA_INCLUDE_DIRS} .) include_directories (${MRAA_INCLUDE_DIRS} . ..)
target_link_libraries (${libname} ${MRAA_LIBRARIES}) target_link_libraries (${libname} ${MRAA_LIBRARIES})
set_target_properties( set_target_properties(
${libname} ${libname}