@matheusbsbs / matheus-bagliano / commits / 9709163687

cmake: generalize the handling of the `CLAR_TEST_OBJS` list

A late-comer to the v2.49.0 party, `sk/unit-test-oid`, added yet another array item to `CLAR_TEST_OBJS`, causing the `win+VS build` job to fail with symptoms like this one: unit-tests-lib.lib(u-oid-array.obj) : error LNK2019: unresolved external symbol cl_parse_any_oid referenced in function fill_array This is a similar scenario to the one that forced me to write 8afda42fce60 (cmake: generalize the handling of the `UNIT_TEST_OBJS` list, 2024-09-18): The hard-coded echo of `CLAR_TEST_OBJS` in `CMakeLists.txt` that recapitulates faithfully what was already hard-coded in `Makefile` would either have to be updated whack-a-mole style, or generalized. Just like I chose the latter option for `UNIT_TEST_OBJS`, I now do the same for `CLAR_TEST_OBJS`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Schindelin committed Mar 6, 2025 at 10:26 UTC 970916368764347c38d36c727b2e6e0086e784e3
1 file changed +8 -4
contrib/buildsystems/CMakeLists.txt
+8 -4
@@ -1001,10 +1001,14 @@ parse_makefile_for_sources(unit-test_SOURCES ${CMAKE_SOURCE_DIR}/Makefile "UNIT_
1001 list(TRANSFORM unit-test_SOURCES REPLACE "\\$\\(UNIT_TEST_DIR\\)/" "${CMAKE_SOURCE_DIR}/t/unit-tests/")
1002 add_library(unit-test-lib STATIC ${unit-test_SOURCES})
1003
1004 +parse_makefile_for_sources(clar-test_SOURCES ${CMAKE_SOURCE_DIR}/Makefile "CLAR_TEST_OBJS")
1005 +list(TRANSFORM clar-test_SOURCES REPLACE "\\$\\(UNIT_TEST_DIR\\)/" "${CMAKE_SOURCE_DIR}/t/unit-tests/")
1006 +add_library(clar-test-lib STATIC ${clar-test_SOURCES})
1007 +
1008 parse_makefile_for_scripts(unit_test_PROGRAMS "UNIT_TEST_PROGRAMS" "")
1009 foreach(unit_test ${unit_test_PROGRAMS})
1010 add_executable("${unit_test}" "${CMAKE_SOURCE_DIR}/t/unit-tests/${unit_test}.c")
1007 - target_link_libraries("${unit_test}" unit-test-lib common-main)
1011 + target_link_libraries("${unit_test}" unit-test-lib clar-test-lib common-main)
1012 set_target_properties("${unit_test}"
1013 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/t/unit-tests/bin)
1014 if(MSVC)
@@ -1046,13 +1050,13 @@ add_custom_command(OUTPUT "${CMAKE_BINARY_DIR}/t/unit-tests/clar.suite"
1050 VERBATIM)
1051
1052 add_library(unit-tests-lib ${clar_test_SUITES}
1049 - "${CMAKE_SOURCE_DIR}/t/unit-tests/clar/clar.c"
1053 "${CMAKE_BINARY_DIR}/t/unit-tests/clar-decls.h"
1054 "${CMAKE_BINARY_DIR}/t/unit-tests/clar.suite"
1055 )
1056 +target_include_directories(clar-test-lib PUBLIC "${CMAKE_BINARY_DIR}/t/unit-tests")
1057 target_include_directories(unit-tests-lib PUBLIC "${CMAKE_BINARY_DIR}/t/unit-tests")
1054 -add_executable(unit-tests "${CMAKE_SOURCE_DIR}/t/unit-tests/unit-test.c")
1055 -target_link_libraries(unit-tests unit-tests-lib common-main)
1058 +add_executable(unit-tests)
1059 +target_link_libraries(unit-tests unit-tests-lib clar-test-lib common-main)
1060 set_target_properties(unit-tests
1061 PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/t/unit-tests/bin)
1062 if(MSVC)