Solve minor bug in NodeJS find script and trying to implement trampoline compatible for all build conditions.

Author: viferga

cmake/FindNodeJS.cmake

@@ -63,9 +63,9 @@ set(NODEJS_PATHS
 
 # Find NodeJS include directories
 if(MSVC OR CMAKE_BUILD_TYPE EQUAL "Debug")
-	set(NODEJS_V8_HEADERS v8.h v8-debug.h v8-profiler.h v8stdint.h v8-version.h)
+	set(NODEJS_V8_HEADERS v8.h v8-debug.h v8-profiler.h v8-version.h)
 else()
-	set(NODEJS_V8_HEADERS v8.h v8stdint.h v8-version.h)
+	set(NODEJS_V8_HEADERS v8.h v8-version.h)
 endif()
 
 set(NODEJS_UV_HEADERS uv.h) # TODO: Add uv-(platform).h?
@@ -167,6 +167,7 @@ if(NODEJS_INCLUDE_DIR)
 	foreach(HEADER IN ITEMS ${NODEJS_HEADERS})
 		if(NOT EXISTS ${NODEJS_INCLUDE_DIR}/${HEADER})
 			set(NODEJS_INCLUDE_DIR FALSE)
+			break()
 		endif()
 	endforeach()
 endif()

source/loaders/node_loader/trampoline/CMakeLists.txt

@@ -67,7 +67,6 @@ if(MSVC)
 
 	add_dependencies(${target_binding} ${target})
 else()
-
 	if(OPTION_BUILD_GUIX)
 		# Get the includes
 		execute_process(
@@ -110,10 +109,9 @@ else()
 			COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
 			COMMAND npm install
 			COMMAND node-gyp ${NODE_LOADER_TRAMPOLINE_BUILD_TYPE} rebuild --verbose
-			COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/build/${CMAKE_BUILD_TYPE}/trampoline.so ${LOADER_LIBRARY_PATH}/trampoline.node
+			COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/build/${CMAKE_BUILD_TYPE}/obj.target/trampoline.so ${LOADER_LIBRARY_PATH}/trampoline.node
 		)
 	endif()
-
 endif()
 
 #