From e30c28e57f19c91f94239338c26674d0b4d168e2 Mon Sep 17 00:00:00 2001
From: viferga <vic798@gmail.com>
Date: Fri, 17 Apr 2020 05:31:13 -0800
Subject: [PATCH] Solve bug in find nodejs cmake script related to headers
 path.

---
 cmake/FindNodeJS.cmake | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/cmake/FindNodeJS.cmake b/cmake/FindNodeJS.cmake
index b2bebb6b0..e9c4c7847 100644
--- a/cmake/FindNodeJS.cmake
+++ b/cmake/FindNodeJS.cmake
@@ -182,7 +182,7 @@ if(NOT NODEJS_INCLUDE_DIR)
 	# NodeJS download and output path (workaround for NodeJS headers)
 	set(NODEJS_DOWNLOAD_URL "https://nodejs.org/dist/v${NODEJS_VERSION}/node-v${NODEJS_VERSION}-headers.tar.gz")
 	set(NODEJS_DOWNLOAD_FILE "${CMAKE_CURRENT_BINARY_DIR}/node-v${NODEJS_VERSION}-headers.tar.gz")
-	set(NODEJS_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/node-v${NODEJS_VERSION}-headers")
+	set(NODEJS_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}/node-v${NODEJS_VERSION}")
 
 	# Download node if needed
 	if(NOT EXISTS "${NODEJS_DOWNLOAD_FILE}")
@@ -196,20 +196,9 @@ if(NOT NODEJS_INCLUDE_DIR)
 		execute_process(COMMAND ${CMAKE_COMMAND} -E tar "xvf" "${NODEJS_DOWNLOAD_FILE}" WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" OUTPUT_QUIET)
 	endif()
 
-	set(NODEJS_INCLUDE_PATHS ${NODEJS_OUTPUT_PATH})
-
-	execute_process(COMMAND ls -la ${NODEJS_INCLUDE_PATHS})
-
-	# Find NodeJS includes
-	find_path(NODEJS_INCLUDE_DIR ${NODEJS_HEADERS}
-		PATHS ${NODEJS_INCLUDE_PATHS}
-		PATH_SUFFIXES ${NODEJS_INCLUDE_SUFFIXES}
-		DOC "NodeJS JavaScript Runtime Headers"
-	)
+	set(NODEJS_INCLUDE_DIR ${NODEJS_OUTPUT_PATH}/include/node)
 endif()
 
-message(STATUS "NodeJS include dir: ${NODEJS_INCLUDE_DIR}")
-
 if(NODEJS_INCLUDE_DIR)
 	# Detect NodeJS V8 version
 	find_file(NODEJS_V8_VERSION_FILE_PATH v8-version.h