Skip to content

Commit 136ce8b

Browse files
committed
migrate to cavl2
1 parent 65f6bbc commit 136ce8b

File tree

6 files changed

+471
-406
lines changed

6 files changed

+471
-406
lines changed

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ AccessModifierOffset: -4
55
AlignAfterOpenBracket: Align
66
AlignConsecutiveAssignments: true
77
AlignConsecutiveDeclarations: true
8+
AlignConsecutiveMacros: true
89
AlignEscapedNewlines: Left
910
AlignOperands: true
1011
AlignTrailingComments: true

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ set(CTEST_OUTPUT_ON_FAILURE ON)
1111
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
1212
set(library_dir "${CMAKE_SOURCE_DIR}/libserard")
1313
set(tests_dir "${CMAKE_SOURCE_DIR}/tests")
14+
set(deps_dir "${CMAKE_SOURCE_DIR}/lib")
1415

1516
# Use -DNO_STATIC_ANALYSIS=1 to suppress static analysis.
1617
# If not suppressed, the tools used here shall be available, otherwise the build will fail.
@@ -44,7 +45,7 @@ add_compile_options(
4445
)
4546
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual -Wnon-virtual-dtor -Wsign-promo")
4647

47-
include_directories(${tests_dir}/catch ${library_dir})
48+
include_directories(${tests_dir}/catch ${library_dir} ${deps_dir})
4849
add_definitions(-DCATCH_CONFIG_FAST_COMPILE=1 -DCATCH_CONFIG_ENABLE_ALL_STRINGMAKERS=1)
4950

5051
set(common_sources ${tests_dir}/catch/main.cpp ${library_dir}/serard.c)

0 commit comments

Comments
 (0)