From 1f939fc18af869c184a24eafd831995868a89a0e Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Sun, 19 Oct 2025 11:53:25 +0100
Subject: [PATCH] CMake: Fix text_render_integration_test with make

Turns out, `add_custom_target`'s `DEPENDS` argument can only
refer to outputs of custom commands in the same directory (i.e. the same
CMakeLists.txt scope).

Interestingly, this worked with all generators except parallel
make, so perhaps there some ongoing work in CMake to allow
cross-directory `DEPENDS`.

Works around this limitation by moving tests to the same scope
(`CMakeLists.txt` file) as assets.
---
 test/CMakeLists.txt => CMake/Tests.cmake | 14 +++++++-------
 CMakeLists.txt                           |  2 +-
 test/Fixtures.cmake                      |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)
 rename test/CMakeLists.txt => CMake/Tests.cmake (91%)

diff --git a/test/CMakeLists.txt b/CMake/Tests.cmake
similarity index 91%
rename from test/CMakeLists.txt
rename to CMake/Tests.cmake
index 9bf66f131..5af78ae88 100644
--- a/test/CMakeLists.txt
+++ b/CMake/Tests.cmake
@@ -7,7 +7,7 @@ set_target_properties(libdevilutionx_so PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CM
 target_link_dependencies(libdevilutionx_so PUBLIC libdevilutionx)
 set_target_properties(libdevilutionx_so PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
-add_library(test_main OBJECT main.cpp)
+add_library(test_main OBJECT test/main.cpp)
 target_link_dependencies(test_main PUBLIC libdevilutionx_so GTest::gtest GTest::gmock)
 
 set(tests
@@ -65,10 +65,10 @@ set(benchmarks
   path_benchmark
 )
 
-include(Fixtures.cmake)
+include(test/Fixtures.cmake)
 
 foreach(test_target ${tests} ${standalone_tests} ${benchmarks})
-  add_executable(${test_target} "${test_target}.cpp")
+  add_executable(${test_target} "test/${test_target}.cpp")
   set_target_properties(${test_target} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
   if(GPERF)
     target_link_libraries(${test_target} PUBLIC ${GPERFTOOLS_LIBRARIES})
@@ -93,10 +93,10 @@ foreach(target ${benchmarks})
   target_include_directories(${target} PRIVATE "${PROJECT_SOURCE_DIR}/Source")
 endforeach()
 
-add_library(app_fatal_for_testing OBJECT app_fatal_for_testing.cpp)
+add_library(app_fatal_for_testing OBJECT test/app_fatal_for_testing.cpp)
 target_sources(app_fatal_for_testing INTERFACE $<TARGET_OBJECTS:app_fatal_for_testing>)
 
-add_library(language_for_testing OBJECT language_for_testing.cpp)
+add_library(language_for_testing OBJECT test/language_for_testing.cpp)
 target_sources(language_for_testing INTERFACE $<TARGET_OBJECTS:language_for_testing>)
 
 target_link_dependencies(codec_test PRIVATE libdevilutionx_codec app_fatal_for_testing)
@@ -166,7 +166,7 @@ if(DEVILUTIONX_SCREENSHOT_FORMAT STREQUAL DEVILUTIONX_SCREENSHOT_FORMAT_PNG AND
       kerning_fit_spacing__align_right.png
       vertical_overflow.png
       vertical_overflow-colors.png
-    SRC_PREFIX fixtures/text_render_integration_test/
+    SRC_PREFIX test/fixtures/text_render_integration_test/
     OUTPUT_DIR "${DEVILUTIONX_TEST_FIXTURES_OUTPUT_DIRECTORY}/text_render_integration_test"
     OUTPUT_VARIABLE _text_render_integration_test_fixtures
   )
@@ -184,4 +184,4 @@ if(DEVILUTIONX_SCREENSHOT_FORMAT STREQUAL DEVILUTIONX_SCREENSHOT_FORMAT_PNG AND
 endif()
 target_link_dependencies(utf8_test PRIVATE libdevilutionx_utf8)
 
-target_include_directories(writehero_test PRIVATE ../3rdParty/PicoSHA2)
+target_include_directories(writehero_test PRIVATE 3rdParty/PicoSHA2)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4cf2b8a9b..baed6b33c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -406,7 +406,7 @@ if(NOT USE_SDL1 AND NOT UWP_LIB)
 endif()
 
 if(BUILD_TESTING)
-  add_subdirectory(test)
+  include(Tests)
 endif()
 
 include(functions/set_relative_file_macro)
diff --git a/test/Fixtures.cmake b/test/Fixtures.cmake
index a0a88e0e1..203c21ef1 100644
--- a/test/Fixtures.cmake
+++ b/test/Fixtures.cmake
@@ -1,7 +1,7 @@
 include(functions/copy_files)
 
 if(NOT DEFINED DEVILUTIONX_TEST_FIXTURES_OUTPUT_DIRECTORY)
-  set(DEVILUTIONX_TEST_FIXTURES_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/fixtures")
+  set(DEVILUTIONX_TEST_FIXTURES_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/test/fixtures")
 endif()
 
 set(devilutionx_fixtures
@@ -98,7 +98,7 @@ set(devilutionx_fixtures
 
 copy_files(
   FILES ${devilutionx_fixtures}
-  SRC_PREFIX fixtures/
+  SRC_PREFIX test/fixtures/
   OUTPUT_DIR "${DEVILUTIONX_TEST_FIXTURES_OUTPUT_DIRECTORY}"
   OUTPUT_VARIABLE DEVILUTIONX_OUTPUT_TEST_FIXTURES_FILES
 )