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

cmake: remove old node include dirs from src/CMakelists.txt

Browse Source 
Since they are now set by find_package(Node REQUIRED) when building the Node.js bindings

Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Mihai Tudor Panu 2017-05-03 16:46:10 -07:00
parent 6a37edcdac
commit 90e4b5d385
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/CMakeLists.txt
View File

@ -365,7 +365,7 @@ macro(upm_swig_node)
swig_link_libraries (jsupm_${libname} ${NODE_LIBRARIES} ${libname}) swig_link_libraries (jsupm_${libname} ${NODE_LIBRARIES} ${libname})
target_include_directories ( ${SWIG_MODULE_jsupm_${libname}_REAL_NAME} target_include_directories ( ${SWIG_MODULE_jsupm_${libname}_REAL_NAME}
PUBLIC PUBLIC
"${NODE_INCLUDE_DIRS}" "${NODEJS_INCLUDE_DIRS}"
${DEPEND_DIRS} ${DEPEND_DIRS}
) )
@ -507,13 +507,6 @@ if (BUILDSWIGNODE)
if(SWIG_VERSION VERSION_LESS 3.0.5 AND NODE_VERSION_STRING VERSION_GREATER 0.12) if(SWIG_VERSION VERSION_LESS 3.0.5 AND NODE_VERSION_STRING VERSION_GREATER 0.12)
message(WARNING "WARNING - SWIG 3.0.5+ required for building with nodejs 0.12. Current version is ${SWIG_VERSION}") message(WARNING "WARNING - SWIG 3.0.5+ required for building with nodejs 0.12. Current version is ${SWIG_VERSION}")
endif() endif()
find_path (NODE_ROOT_DIR "include/node/node.h")
set (NODE_INCLUDE_DIRS
${NODE_ROOT_DIR}/include/src
${NODE_ROOT_DIR}/include/node
${NODE_ROOT_DIR}/include/deps/v8/include
${NODE_ROOT_DIR}/include/deps/uv/include
)
macro(createpackagejson) macro(createpackagejson)
if (NPM) if (NPM)
# Dependency to generate wrappers before packing, skip modules that depend on 3rd party libs # Dependency to generate wrappers before packing, skip modules that depend on 3rd party libs