Skip to content

Commit 235674f

Browse files
committed
Merge branch 'develop'
2 parents 3e3a8db + 8e058c1 commit 235674f

File tree

11 files changed

+15
-18
lines changed

11 files changed

+15
-18
lines changed

.pre-commit-config.yaml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
# See https://pre-commit.com for more information
2-
# See https://pre-commit.com/hooks.html for more hooks
31
repos:
4-
- repo: https://github.com/pre-commit/pre-commit-hooks
5-
rev: v3.2.0
6-
hooks:
7-
- id: trailing-whitespace
8-
- id: end-of-file-fixer
9-
- id: check-yaml
10-
- id: check-added-large-files
2+
- repo: https://github.com/pre-commit/pre-commit-hooks
3+
rev: v3.2.0
4+
hooks:
5+
- id: trailing-whitespace
6+
id: end-of-file-fixer
7+
id: check-yaml
8+
id: check-added-large-files
119

1210
# CMake formatting
1311
- repo: https://github.com/cheshirekow/cmake-format-precommit
@@ -17,3 +15,10 @@ repos:
1715
additional_dependencies: [pyyaml]
1816
types: [file]
1917
files: (\.cmake|CMakeLists.txt)(.in)?$
18+
19+
# Clang format the codebase automatically
20+
- repo: https://github.com/pre-commit/mirrors-clang-format
21+
rev: "v13.0.1"
22+
hooks:
23+
- id: clang-format
24+
types_or: [c++, c]

CMakeLists.txt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ if(${ADD_DEMO})
7171
set(CMAKE_CXX_FLAGS
7272
"-Wall -g -DUSE_GUI=${USE_GUI} -DMATPLOTLIB_MINOR_VER_GTE_4=${MATPLOTLIB_MINOR_VER_GTE_4}"
7373
)
74+
add_subdirectory(gallery/tests)
7475
add_subdirectory(gallery/lines_bars_and_markers)
7576
add_subdirectory(gallery/subplots_axes_and_figures)
7677
add_subdirectory(gallery/statistics)
@@ -81,15 +82,6 @@ if(${ADD_DEMO})
8182
add_subdirectory(gallery/scales)
8283
endif()
8384

84-
# test
85-
enable_testing()
86-
if(NOT DEFINED DO_TEST)
87-
set(DO_TEST ON)
88-
endif()
89-
if(${DO_TEST})
90-
add_subdirectory(tests)
91-
endif()
92-
9385
# install https://dominikberner.ch/cmake-interface-lib/
9486
include(GNUInstallDirs)
9587
add_library(${PROJECT_NAME} INTERFACE)
File renamed without changes.

0 commit comments

Comments
 (0)