Skip to content

Commit e30c28e

Browse files
committed
Solve bug in find nodejs cmake script related to headers path.
1 parent 033dbad commit e30c28e

File tree

1 file changed

+2
-13
lines changed

1 file changed

+2
-13
lines changed

cmake/FindNodeJS.cmake

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ if(NOT NODEJS_INCLUDE_DIR)
182182
# NodeJS download and output path (workaround for NodeJS headers)
183183
set(NODEJS_DOWNLOAD_URL "https://nodejs.org/dist/v${NODEJS_VERSION}/node-v${NODEJS_VERSION}-headers.tar.gz")
184184
set(NODEJS_DOWNLOAD_FILE "${CMAKE_CURRENT_BINARY_DIR}/node-v${NODEJS_VERSION}-headers.tar.gz")
185-
set(NODEJS_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/node-v${NODEJS_VERSION}-headers")
185+
set(NODEJS_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/node-v${NODEJS_VERSION}")
186186

187187
# Download node if needed
188188
if(NOT EXISTS "${NODEJS_DOWNLOAD_FILE}")
@@ -196,20 +196,9 @@ if(NOT NODEJS_INCLUDE_DIR)
196196
execute_process(COMMAND ${CMAKE_COMMAND} -E tar "xvf" "${NODEJS_DOWNLOAD_FILE}" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" OUTPUT_QUIET)
197197
endif()
198198

199-
set(NODEJS_INCLUDE_PATHS ${NODEJS_OUTPUT_PATH})
200-
201-
execute_process(COMMAND ls -la ${NODEJS_INCLUDE_PATHS})
202-
203-
# Find NodeJS includes
204-
find_path(NODEJS_INCLUDE_DIR ${NODEJS_HEADERS}
205-
PATHS ${NODEJS_INCLUDE_PATHS}
206-
PATH_SUFFIXES ${NODEJS_INCLUDE_SUFFIXES}
207-
DOC "NodeJS JavaScript Runtime Headers"
208-
)
199+
set(NODEJS_INCLUDE_DIR ${NODEJS_OUTPUT_PATH}/include/node)
209200
endif()
210201

211-
message(STATUS "NodeJS include dir: ${NODEJS_INCLUDE_DIR}")
212-
213202
if(NODEJS_INCLUDE_DIR)
214203
# Detect NodeJS V8 version
215204
find_file(NODEJS_V8_VERSION_FILE_PATH v8-version.h

0 commit comments

Comments
 (0)