Trying to solve bugs with FindNodeJS headers.

Author: viferga

cmake/FindNodeJS.cmake

@@ -178,8 +178,42 @@ find_path(NODEJS_INCLUDE_DIR ${NODEJS_HEADERS}
 	DOC "NodeJS JavaScript Runtime Headers"
 )
 
-# Detect NodeJS V8 version
+if(NOT NODEJS_INCLUDE_DIR AND NOT NODEJS_VERSION)
+	# We do not have any way to know what version to install
+	message(WARNING "NodeJS headers could not be found, neither a valid NodeJS version.")
+	return()
+else()
+	# TODO: Remove this workaround when NodeJS begins to distribute node as a shared library (maybe never?) with proper includes
+
+	# 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")
+
+	# Download node if needed
+	if(NOT EXISTS "${NODEJS_DOWNLOAD_FILE}")
+		message(STATUS "Downloading NodeJS headers")
+		file(DOWNLOAD ${NODEJS_DOWNLOAD_URL} ${NODEJS_DOWNLOAD_FILE})
+	endif()
+
+	# Decompress node if needed
+	if(NOT EXISTS "${NODEJS_OUTPUT_PATH}")
+		message(STATUS "Extract NodeJS headers")
+		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})
+
+	# Find NodeJS includes
+	find_path(NODEJS_INCLUDE_DIR ${NODEJS_HEADERS}
+		PATHS ${NODEJS_INCLUDE_PATHS}
+		PATH_SUFFIXES ${NODEJS_INCLUDE_SUFFIXES}
+		DOC "NodeJS JavaScript Runtime Headers"
+	)
+endif()
+
 if(NODEJS_INCLUDE_DIR)
+	# Detect NodeJS V8 version
 	find_file(NODEJS_V8_VERSION_FILE_PATH v8-version.h
 		PATHS ${NODEJS_INCLUDE_DIR}
 		PATH_SUFFIXES ${NODEJS_INCLUDE_SUFFIXES}
@@ -214,7 +248,7 @@ if(NODEJS_INCLUDE_DIR)
 		endwhile()
 	endif()
 
-	# Get node version
+	# Get node module version
 	find_file(NODEJS_VERSION_FILE_PATH node_version.h
 		PATHS ${NODEJS_INCLUDE_DIR}
 		PATH_SUFFIXES ${NODEJS_INCLUDE_SUFFIXES}
@@ -229,6 +263,7 @@ if(NODEJS_INCLUDE_DIR)
 	endif()
 endif()
 
+# Find NodeJS library from module version
 if(NODEJS_MODULE_VERSION)
 	# NodeJS library names
 	set(NODEJS_LIBRARY_NAMES
@@ -351,90 +386,6 @@ if(NOT NODEJS_LIBRARY)
 		endif()
 	endif()
 
-	if(NOT NODEJS_INCLUDE_DIR)
-		# TODO: Headers are not properly installed, instead of placing all of them in the same folder
-		# they are placed in different folders after install (deps/{v8,uv}), this workaround will solve
-		# the include dependency problem, but this needs to be refactored in the future for properly handling headers,
-		# meanwhile we will install them manually
-
-		# NodeJS download and output path (workaround to compile node as a shared library)
-		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")
-
-		# Download node if needed
-		if(NOT EXISTS "${NODEJS_DOWNLOAD_FILE}")
-			message(STATUS "Downloading NodeJS headers")
-			file(DOWNLOAD ${NODEJS_DOWNLOAD_URL} ${NODEJS_DOWNLOAD_FILE})
-		endif()
-
-		# Decompress node if needed
-		if(NOT EXISTS "${NODEJS_OUTPUT_PATH}")
-			message(STATUS "Extract NodeJS headers")
-			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})
-
-		# Find NodeJS includes
-		find_path(NODEJS_INCLUDE_DIR ${NODEJS_HEADERS}
-			PATHS ${NODEJS_INCLUDE_PATHS}
-			PATH_SUFFIXES ${NODEJS_INCLUDE_SUFFIXES}
-			DOC "NodeJS JavaScript Runtime Headers"
-		)
-
-		# Detect NodeJS V8 version
-		if(NODEJS_INCLUDE_DIR)
-			find_file(NODEJS_V8_VERSION_FILE_PATH v8-version.h
-				PATHS ${NODEJS_INCLUDE_DIR}
-				PATH_SUFFIXES ${NODEJS_INCLUDE_SUFFIXES}
-				DOC "NodeJS V8 JavaScript Version Header"
-			)
-
-			if(NODEJS_V8_VERSION_FILE_PATH)
-				file(READ ${NODEJS_V8_VERSION_FILE_PATH} NODEJS_V8_VERSION_FILE)
-
-				string(REGEX MATCH "#define V8_MAJOR_VERSION ([0-9]+)" NODEJS_V8_VERSION_MAJOR_DEF ${NODEJS_V8_VERSION_FILE})
-				string(REGEX MATCH "([0-9]+)$" NODEJS_V8_VERSION_MAJOR ${NODEJS_V8_VERSION_MAJOR_DEF})
-
-				string(REGEX MATCH "#define V8_MINOR_VERSION ([0-9]+)" NODEJS_V8_VERSION_MINOR_DEF ${NODEJS_V8_VERSION_FILE})
-				string(REGEX MATCH "([0-9]+)$" NODEJS_V8_VERSION_MINOR ${NODEJS_V8_VERSION_MINOR_DEF})
-
-				string(REGEX MATCH "#define V8_BUILD_NUMBER ([0-9]+)" NODEJS_V8_VERSION_PATCH_DEF ${NODEJS_V8_VERSION_FILE})
-				string(REGEX MATCH "([0-9]+)$" NODEJS_V8_VERSION_PATCH ${NODEJS_V8_VERSION_PATCH_DEF})
-
-				string(REGEX MATCH "#define V8_PATCH_LEVEL ([0-9]+)" NODEJS_V8_VERSION_TWEAK_DEF ${NODEJS_V8_VERSION_FILE})
-				string(REGEX MATCH "([0-9]+)$" NODEJS_V8_VERSION_TWEAK ${NODEJS_V8_VERSION_TWEAK_DEF})
-
-				set(NODEJS_V8_VERSION "${NODEJS_V8_VERSION_MAJOR}.${NODEJS_V8_VERSION_MINOR}.${NODEJS_V8_VERSION_PATCH}.${NODEJS_V8_VERSION_TWEAK}")
-
-				set(NODEJS_V8_VERSION_HEX 0x0${NODEJS_V8_VERSION_MAJOR}${NODEJS_V8_VERSION_MINOR}${NODEJS_V8_VERSION_PATCH}${NODEJS_V8_VERSION_TWEAK})
-				string(LENGTH "${NODEJS_V8_VERSION_HEX}" NODEJS_V8_VERSION_HEX_LENGTH)
-
-				while(NODEJS_V8_VERSION_HEX_LENGTH LESS 8)
-
-					set(NODEJS_V8_VERSION_HEX "${NODEJS_V8_VERSION_HEX}0")
-					string(LENGTH "${NODEJS_V8_VERSION_HEX}" NODEJS_V8_VERSION_HEX_LENGTH)
-
-				endwhile()
-			endif()
-
-			# Get node version
-			find_file(NODEJS_VERSION_FILE_PATH node_version.h
-				PATHS ${NODEJS_INCLUDE_DIR}
-				PATH_SUFFIXES ${NODEJS_INCLUDE_SUFFIXES}
-				DOC "NodeJS JavaScript Version Header"
-			)
-
-			if(NODEJS_VERSION_FILE_PATH)
-				file(READ ${NODEJS_VERSION_FILE_PATH} NODEJS_VERSION_FILE)
-
-				string(REGEX MATCH "#define NODE_MODULE_VERSION ([0-9]+)" NODEJS_MODULE_VERSION_DEF ${NODEJS_VERSION_FILE})
-				string(REGEX MATCH "([0-9]+)$" NODEJS_MODULE_VERSION ${NODEJS_MODULE_VERSION_DEF})
-			endif()
-		endif()
-	endif()
-
 	if(NODEJS_MODULE_VERSION)
 		# NodeJS library names
 		set(NODEJS_LIBRARY_NAMES