Skip to content

Commit 7bf69f5

Browse files
committed
build update
1 parent d025332 commit 7bf69f5

File tree

2 files changed

+10
-55
lines changed

2 files changed

+10
-55
lines changed

CMakeLists.txt

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,13 @@ file(GLOB COMMON_TEST_SOURCES "tests/test.*")
3232
file(GLOB EXAMPLE_SOURCES "examples/*.c")
3333

3434
# lint code
35-
find_program(CMAKE_CXX_CPPCHECK NAMES cppcheck)
36-
if (CMAKE_CXX_CPPCHECK)
37-
add_custom_target(cppcheck ALL
38-
${CMAKE_CXX_CPPCHECK}
39-
--enable=all --inline-suppr --error-exitcode=1 --suppress=missingIncludeSystem -I ./include/ ./src/*.c
40-
WORKING_DIRECTORY "${X_CMAKE_PROJECT_ROOT_DIR}")
41-
endif()
35+
utils_cppcheck(INCLUDE_DIRECTORY "./include/" SOURCES "./src/*.c" WORKING_DIRECTORY "${X_CMAKE_PROJECT_ROOT_DIR}")
4236

4337
# format code
44-
if(DEFINED ENV{X_CMAKE_UNCRUSTIFY_ENABLED})
45-
add_custom_target(uncrustify ALL
46-
uncrustify
47-
-c ${X_CMAKE_PROJECT_ROOT_DIR}/uncrustify.cfg
48-
--no-backup ${SOURCES} ${HEADER_SOURCES} ${TEST_SOURCES} ${EXAMPLE_SOURCES})
49-
endif()
38+
utils_uncrustify(
39+
CONFIG_FILE "${X_CMAKE_PROJECT_ROOT_DIR}/uncrustify.cfg"
40+
SOURCES ${SOURCES} ${HEADER_SOURCES} ${TEST_SOURCES} ${EXAMPLE_SOURCES}
41+
)
5042

5143
# create static library
5244
add_library(${CMAKE_PROJECT_NAME} STATIC ${SOURCES})
@@ -62,9 +54,13 @@ set_target_properties(example PROPERTIES COMPILE_FLAGS "${X_CMAKE_C_FLAGS}")
6254
# tests
6355
include(CTest)
6456

57+
utils_setup_test_lib(
58+
SOURCES "${COMMON_TEST_SOURCES}"
59+
COMPILATION_FLAGS "${X_CMAKE_C_FLAGS}"
60+
)
6561
utils_setup_c_all_tests(
66-
ADDITIONAL_SOURCES "${COMMON_TEST_SOURCES}"
6762
COMPILATION_FLAGS "${X_CMAKE_C_FLAGS}"
6863
BINARY_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
64+
LIBRARIES "Test"
6965
)
7066

Makefile.toml

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)