unittests: Fixes thunk unittest path

This hasn't been run in CI for awhile so this was missed when I was
testing it. I need to see what I can do to get this going in CI again.

CMakeLists.txt

@@ -39,10 +39,16 @@ set (X86_32_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/Data/CMake/toolchain_x86
 set (X86_64_TOOLCHAIN_FILE "${CMAKE_CURRENT_SOURCE_DIR}/Data/CMake/toolchain_x86_64.cmake" CACHE FILEPATH "Toolchain file for the (cross-)compiler targeting x86_64")
 set (X86_DEV_ROOTFS "/" CACHE FILEPATH "Path to the sysroot used for cross-compiling for i686 and x86_64")
 set (DATA_DIRECTORY "" CACHE PATH "Global data directory (override)")
+set (HOSTLIBS_DATA_DIRECTORY "" CACHE PATH "Global data directory (override)")
 if (NOT DATA_DIRECTORY)
   set (DATA_DIRECTORY "${CMAKE_INSTALL_PREFIX}/share/fex-emu")
 endif()
 
+include(GNUInstallDirs)
+if (NOT HOSTLIBS_DATA_DIRECTORY)
+  set(HOSTLIBS_DATA_DIRECTORY "${CMAKE_INSTALL_FULL_LIBDIR}/fex-emu")
+endif()
+
 string(FIND ${CMAKE_BASE_NAME} mingw CONTAINS_MINGW)
 if (NOT CONTAINS_MINGW EQUAL -1)
   message (STATUS "Mingw build")

FEXCore/Source/CMakeLists.txt

@@ -1,4 +1,3 @@
-include(GNUInstallDirs)
 set (MAN_DIR share/man CACHE PATH "MAN_DIR")
 
 set (FEXCORE_BASE_SRCS

Source/Tools/FEXGDBReader/CMakeLists.txt

@@ -1,4 +1,3 @@
-include(GNUInstallDirs)
 set(NAME FEXGDBReader)
 set(SRCS FEXGDBReader.cpp)
 

Source/Windows/ARM64EC/CMakeLists.txt

@@ -1,5 +1,3 @@
-include(GNUInstallDirs)
-
 add_library(arm64ecfex SHARED
   Module.cpp
   Module.S

Source/Windows/WOW64/CMakeLists.txt

@@ -1,5 +1,3 @@
-include(GNUInstallDirs)
-
 add_library(wow64fex SHARED
   Module.cpp
   libwow64fex.def

ThunkLibs/HostLibs/CMakeLists.txt

@@ -1,13 +1,8 @@
 cmake_minimum_required(VERSION 3.14)
 project(host-thunks)
 include(${FEX_PROJECT_SOURCE_DIR}/Data/CMake/version_to_variables.cmake)
-include(GNUInstallDirs)
 
 set(CMAKE_CXX_STANDARD 20)
-set (HOSTLIBS_DATA_DIRECTORY "" CACHE PATH "Global data directory (override)")
-if (NOT HOSTLIBS_DATA_DIRECTORY)
-  set(HOSTLIBS_DATA_DIRECTORY "${CMAKE_INSTALL_FULL_LIBDIR}/fex-emu")
-endif()
 option(ENABLE_CLANG_THUNKS "Enable building thunks with clang" FALSE)
 
 if (ENABLE_CLANG_THUNKS)

unittests/ThunkFunctionalTests/CMakeLists.txt

@@ -2,7 +2,7 @@ set(FUNCTIONAL_DEPENDS "")
 
 function(AddThunksTest Bin ThunksFile)
   set (ARGS
-    "-t" "${CMAKE_INSTALL_PREFIX}/lib/fex-emu/HostThunks"
+    "-t" "${HOSTLIBS_DATA_DIRECTORY}/HostThunks"
     "-j" "${CMAKE_INSTALL_PREFIX}/share/fex-emu/GuestThunks"
     "-o" "stderr" "--no-silentlog" "-n" "500"
     )