cmake: rename clar-related variables to avoid confusion
PATCH 1/1 cmake: rename clar-related variables to avoid confusion
From: Johannes Schindelin <[email protected]>
In c3de556a841f (Makefile: rename clar-related variables to avoid confusion, 2024-09-10) some Makefile variables were renamed that were partially used by the CMake definition. Adapt the latter to the new lay of the land.
---
cmake: rename clar-related variables to avoid confusion
This is an add-on for ps/clar-unit-tests to let it build with CMake and Visual C.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1795%2Fdscho%2Fclar-unit-tests%2Bcmake-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1795/dscho/clar-unit-tests+cmake-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1795
contrib/buildsystems/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
contrib/buildsystems/CMakeLists.txt +6 -6
@@ -1004,14 +1004,14 @@ foreach(unit_test ${unit_test_PROGRAMS}) endif() endforeach() -parse_makefile_for_scripts(unit_tests_SUITES "UNIT_TESTS_SUITES" "") +parse_makefile_for_scripts(clar_test_SUITES "CLAR_TEST_SUITES" "") set(clar_decls "") set(clar_cbs "") set(clar_cbs_count 0) set(clar_suites "static struct clar_suite _clar_suites[] = {\n") -list(LENGTH unit_tests_SUITES clar_suites_count) -foreach(suite ${unit_tests_SUITES}) +list(LENGTH clar_test_SUITES clar_suites_count) +foreach(suite ${clar_test_SUITES}) file(STRINGS "${CMAKE_SOURCE_DIR}/t/unit-tests/${suite}.c" decls REGEX "^void test_${suite}__[a-zA-Z_0-9][a-zA-Z_0-9]*\\(void\\)$")
@@ -1042,9 +1042,9 @@ string(APPEND clar_suites file(WRITE "${CMAKE_BINARY_DIR}/t/unit-tests/clar-decls.h" "${clar_decls}") file(WRITE "${CMAKE_BINARY_DIR}/t/unit-tests/clar.suite" "${clar_decls}" "${clar_cbs}" "${clar_suites}") -list(TRANSFORM unit_tests_SUITES PREPEND "${CMAKE_SOURCE_DIR}/t/unit-tests/") -list(TRANSFORM unit_tests_SUITES APPEND ".c") -add_library(unit-tests-lib ${unit_tests_SUITES} "${CMAKE_SOURCE_DIR}/t/unit-tests/clar/clar.c") +list(TRANSFORM clar_test_SUITES PREPEND "${CMAKE_SOURCE_DIR}/t/unit-tests/") +list(TRANSFORM clar_test_SUITES APPEND ".c") +add_library(unit-tests-lib ${clar_test_SUITES} "${CMAKE_SOURCE_DIR}/t/unit-tests/clar/clar.c") target_include_directories(unit-tests-lib PRIVATE "${CMAKE_SOURCE_DIR}/t/unit-tests") add_executable(unit-tests "${CMAKE_SOURCE_DIR}/t/unit-tests/unit-test.c") target_link_libraries(unit-tests unit-tests-lib common-main)
base-commit: c3de556a841f132832f742d1c4d3a2618ee3b355
Signature · 1 line
gitgitgadget
"Johannes Schindelin via GitGitGadget" <[email protected]>
Quoted 7 lines · writes:
From: Johannes Schindelin <[email protected]>
In
c3de556a841f(Makefile: rename clar-related variables to avoid confusion, 2024-09-10) someMakefilevariables were renamed that were partially used by the CMake definition. Adapt the latter to the new lay of the land.
Quoted 6 lines
Signed-off-by Johannes Schindelin <[email protected]>---
cmake: rename clar-related variables to avoid confusionThis is an add-on for ps/clar-unit-tests to let it build with CMake and Visual C.
Thanks.
The base topic is expected to graduate to 'master' in a day or two, so this is a very timely and welcome update.
Quoted 6 lines · Johannes Schindelin via GitGitGadget
From: Johannes Schindelin <[email protected]>
In
c3de556a841f(Makefile: rename clar-related variables to avoid confusion, 2024-09-10) someMakefilevariables were renamed that were partially used by the CMake definition. Adapt the latter to the new lay of the land.
Ah, thanks for the fixup! I really hope that I can (soonish) make the case for CMake being part of our officially supported build systems that is also exercised as part of our CI.
Patrick