Skip to content

Commit 4e9fb66

Browse files
committed
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 8afda42 (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 <[email protected]>
1 parent 4cf536f commit 4e9fb66

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

contrib/buildsystems/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,13 +1079,13 @@ add_custom_command(OUTPUT "${CMAKE_BINARY_DIR}/t/unit-tests/clar.suite"
10791079
VERBATIM)
10801080

10811081
add_library(unit-tests-lib ${clar_test_SUITES}
1082-
"${CMAKE_SOURCE_DIR}/t/unit-tests/clar/clar.c"
10831082
"${CMAKE_BINARY_DIR}/t/unit-tests/clar-decls.h"
10841083
"${CMAKE_BINARY_DIR}/t/unit-tests/clar.suite"
10851084
)
1085+
target_include_directories(clar-test-lib PUBLIC "${CMAKE_BINARY_DIR}/t/unit-tests")
10861086
target_include_directories(unit-tests-lib PUBLIC "${CMAKE_BINARY_DIR}/t/unit-tests")
1087-
add_executable(unit-tests "${CMAKE_SOURCE_DIR}/t/unit-tests/unit-test.c")
1088-
target_link_libraries(unit-tests unit-tests-lib common-main)
1087+
add_executable(unit-tests)
1088+
target_link_libraries(unit-tests unit-tests-lib clar-test-lib common-main)
10891089
set_target_properties(unit-tests
10901090
PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/t/unit-tests/bin)
10911091
if(MSVC)

0 commit comments

Comments
 (0)