Skip to content

Commit

Permalink
N-API versions support 6 and 7
Browse files Browse the repository at this point in the history
  • Loading branch information
bsrdjan committed Dec 21, 2020
1 parent ccaddd4 commit d395ad0
Show file tree
Hide file tree
Showing 4 changed files with 9,982 additions and 25 deletions.
4 changes: 3 additions & 1 deletion CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ Change log
2.4.0 (XXXX-XX-XX)
------------------

- CHARnn fields gets cut off after the first zero byte; fix #193
- CHARnn fields gets cut off after the first zero byte; fix #193 b4aeaf9
- CMakeLists SDK version output ccaddd4
- N-API versions support 6 and 7

2.3.1 (2020-11-18)
------------------
Expand Down
13 changes: 5 additions & 8 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ add_compile_definitions(NAPI_VERSION=${NAPI_VERSION})
execute_process(COMMAND node -p "require('node-addon-api').include"
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE NAPI_INCLUDE_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
OUTPUT_STRIP_TRAILING_WHITESPACE )
string(REPLACE "\"" "" NAPI_INCLUDE_DIR ${NAPI_INCLUDE_DIR})

# NodeJS headers
Expand All @@ -50,17 +49,14 @@ if (NOT DEFINED ENV{NODE_HEADERS_INCLUDE_DIR})
execute_process(COMMAND cmd /c "npm -g prefix"
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE NODE_HEADERS_INCLUDE_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
OUTPUT_STRIP_TRAILING_WHITESPACE )
else()
execute_process(COMMAND npm -g prefix
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
OUTPUT_VARIABLE NODE_HEADERS_INCLUDE_DIR
OUTPUT_STRIP_TRAILING_WHITESPACE
)
OUTPUT_STRIP_TRAILING_WHITESPACE )
endif()
string(CONCAT NODE_HEADERS_INCLUDE_DIR ${NODE_HEADERS_INCLUDE_DIR} "/include")
#string(REPLACE "\n" "" NODE_HEADERS_INCLUDE_DIR ${NODE_HEADERS_INCLUDE_DIR})

if (NOT EXISTS "${NODE_HEADERS_INCLUDE_DIR}")
set(NODE_HEADERS_FILENAME "node-${NODE_VERSION}-headers.tar.gz")
Expand Down Expand Up @@ -106,8 +102,9 @@ endif ( MSVC )
# build
#

# All platforms
message("N-API version: ${NAPI_VERSION} ${NODE_HEADERS_INCLUDE_DIR}")

# All platforms

# https://launchpad.support.sap.com/#/notes/2573953
target_compile_definitions(${PROJECT_NAME} PUBLIC
Expand Down
Loading

0 comments on commit d395ad0

Please sign in to comment.