Solve issues on funchook windows.

metacall · Feb 26, 2025 · f8c7b4c · f8c7b4c
1 parent 53620af
commit f8c7b4c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/cmake/CompileOptions.cmake b/cmake/CompileOptions.cmake
@@ -152,7 +152,6 @@ endif()
 function(find_sanitizer NAME LINK_OPTION)
 	string(TOUPPER "${NAME}" NAME_UPPER)
 	set(SANITIZER_PROGRAM_CODE "int main() {return 0;}")
-	message(STATUS "${CMAKE_CURRENT_BINARY_DIR}/sanitizer_locate.cpp")
 	file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/sanitizer_locate.cpp" "${SANITIZER_PROGRAM_CODE}")
 
 	try_compile(

diff --git a/source/detours/funchook_detour/CMakeLists.txt b/source/detours/funchook_detour/CMakeLists.txt
@@ -29,18 +29,21 @@ set(FUNCHOOK_SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/funchook/src/funchook")
 
 if(WIN32)
 	set(FUNCHOOK_BUILD_TARGET "INSTALL")
-	set(FUNCHOOK_LIBRARY_DIR "${FUNCHOOK_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/funchook_dll.${FUNCHOOK_LIBRARY_SUFFIX}")
+	set(FUNCHOOK_LIBRARY_NAME "funchook_dll.${FUNCHOOK_LIBRARY_SUFFIX}")
+	set(FUNCHOOK_LIBRARY_DIR "${FUNCHOOK_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/${FUNCHOOK_LIBRARY_NAME}")
 	set(FUNCHOOK_LIBRARY_INSTALL_NAME "funchook.${FUNCHOOK_LIBRARY_INSTALL_SUFFIX}")
 	set(FUNCHOOK_LIBRARY_INSTALL_DIR "${FUNCHOOK_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/${FUNCHOOK_LIBRARY_INSTALL_NAME}")
 else()
 	set(FUNCHOOK_BUILD_TARGET "install")
-	set(FUNCHOOK_LIBRARY_INSTALL_NAME "libfunchook.${FUNCHOOK_LIBRARY_SUFFIX}")
-	set(FUNCHOOK_LIBRARY_DIR "${FUNCHOOK_SOURCE_DIR}/${FUNCHOOK_LIBRARY_INSTALL_NAME}")
+	set(FUNCHOOK_LIBRARY_NAME "libfunchook.${FUNCHOOK_LIBRARY_SUFFIX}")
+	set(FUNCHOOK_LIBRARY_DIR "${FUNCHOOK_SOURCE_DIR}/${FUNCHOOK_LIBRARY_NAME}")
+	set(FUNCHOOK_LIBRARY_INSTALL_NAME "${FUNCHOOK_LIBRARY_NAME}")
 	set(FUNCHOOK_LIBRARY_INSTALL_DIR "${FUNCHOOK_LIBRARY_DIR}")
 endif()
 
 set(FUNCHOOK_INSTALL_DIR "${PROJECT_OUTPUT_DIR}")
-set(FUNCHOOK_LIBRARY "${FUNCHOOK_INSTALL_DIR}/${FUNCHOOK_LIBRARY_INSTALL_NAME}")
+set(FUNCHOOK_LIBRARY "${PROJECT_OUTPUT_DIR}/${FUNCHOOK_LIBRARY_NAME}")
+set(FUNCHOOK_LIBRARY_INSTALL "${PROJECT_OUTPUT_DIR}/${FUNCHOOK_LIBRARY_INSTALL_NAME}")
 set(FUNCHOOK_INCLUDE_DIR "${FUNCHOOK_SOURCE_DIR}/include")
 
 ExternalProject_Add(${target_depends}
@@ -232,7 +235,7 @@ target_link_options(${target}
 
 # Dependency
 install(FILES
-	${FUNCHOOK_LIBRARY}
+	${FUNCHOOK_LIBRARY_INSTALL}
 	DESTINATION ${INSTALL_LIB}
 	COMPONENT runtime
 )

diff --git a/source/loaders/node_loader/CMakeLists.txt b/source/loaders/node_loader/CMakeLists.txt
@@ -157,6 +157,7 @@ target_link_libraries(${target}
 	PRIVATE
 	${META_PROJECT_NAME}::metacall # MetaCall library
 
+	# TODO: Replace this by /FORCE:UNRESOLVED on MSVC for later on resolving it ourselves?
 	$<$<CXX_COMPILER_ID:MSVC>:${NodeJS_LIBRARY}> # NodeJS library
 
 	PUBLIC
-Original file line number
+Diff line change
@@ Expand Up / @@ -157,6 +157,7 @@ target_link_libraries(${target} @@
     	PRIVATE
     	${META_PROJECT_NAME}::metacall # MetaCall library
+    	# TODO: Replace this by /FORCE:UNRESOLVED on MSVC for later on resolving it ourselves?
     	$<$<CXX_COMPILER_ID:MSVC>:${NodeJS_LIBRARY}> # NodeJS library
     	PUBLIC
@@ Expand Down @@