Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

mraajs: Allow user to override node module install path.

Browse Source 
Currently, node modules install under the current environment's
node install path.  This happens even if cmake is passed a
CMAKE_INSTALL_PREFIX.

This change checks if a CMAKE_INSTALL_PREFIX has been provided,
in which case it prepens the install path to the NODE_MODULE_INSTALL_PATH.
If a CMAKE_INSTALL_PREFIX has NOT been provided, the the mraa node
modules get install according to the NODE_ROOT_DIR.

This fixes a problem with an install case where the caller does not
have write access to the NODE_ROOT_DIR.

Signed-off-by: Noel Eck <noel.eck@intel.com>
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>
This commit is contained in:
Noel Eck
2016-03-23 12:17:25 -07:00
committed by Brendan Le Foll
parent 63a29e92ea
commit 14de175425
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/javascript/CMakeLists.txt
View File

@@ -54,7 +54,15 @@ if (${V8_VERSION_MAJOR} GREATER 3)
endif () endif ()
endif () endif ()
# If a CMAKE_INSTALL_PREFIX has NOT been provided, set NODE_MODULE_INSTALL_PATH
# base on the NODE_ROOT_DIR.
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set (NODE_MODULE_INSTALL_PATH ${NODE_ROOT_DIR}/lib/node_modules/mraa/) set (NODE_MODULE_INSTALL_PATH ${NODE_ROOT_DIR}/lib/node_modules/mraa/)
# If a CMAKE_INSTALL_PREFIX has been provided, set NODE_MODULE_INSTALL_PATH
# relative to the provide install directory.
else (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set (NODE_MODULE_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/lib/node_modules/mraa/)
endif (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
message (STATUS "INFO - install NODE modules to ${NODE_MODULE_INSTALL_PATH}") message (STATUS "INFO - install NODE modules to ${NODE_MODULE_INSTALL_PATH}")
macro (mraa_CREATE_INSTALL_PACKAGE_JSON generated_file install_location) macro (mraa_CREATE_INSTALL_PACKAGE_JSON generated_file install_location)