From e4a3654d98593797e9666be442f6316140e5d009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20O=2E=20Sel=C3=A5sdal?= Date: Wed, 16 Jul 2025 00:39:20 +0200 Subject: [PATCH] osx cmake wip --- CMakeLists.txt | 2 +- test/CMakeLists.txt | 9 ++++++--- test/test_runner.c | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d2625d3..47052f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ +cmake_minimum_required(VERSION 4.0.0) project(libucore C) -cmake_minimum_required(VERSION 2.8.0) execute_process(COMMAND git -C ${CMAKE_SOURCE_DIR} describe --abbrev=5 --dirty --always OUTPUT_VARIABLE version_revision WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND hostname OUTPUT_VARIABLE build_host OUTPUT_STRIP_TRAILING_WHITESPACE) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 39d65c7..7551094 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,8 +1,11 @@ file(GLOB TEST_SOURCE_FILES test_*.c) +if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + include_directories("/opt/homebrew/include") +endif() add_executable(test_runner ${TEST_SOURCE_FILES}) target_link_libraries(test_runner check ucore rt) -add_custom_target(runtest COMMAND test_runner - DEPENDS test_runner - WORKING_DIRECTORY ${CMAKE_PROJECT_DIR}) +add_custom_target(runtest COMMAND test_runner + DEPENDS test_runner + WORKING_DIRECTORY ${CMAKE_PROJECT_DIR}) diff --git a/test/test_runner.c b/test/test_runner.c index 27f0e79..fab2441 100644 --- a/test/test_runner.c +++ b/test/test_runner.c @@ -65,7 +65,7 @@ static suite_func suites[] = { restart_counter_suite, iomux_suite, iomux_signal_suite, - string_suite + string_suite, ringbuf_suite };