Skip to content

Commit 84c6cd8

Browse files
committed
Update cmake and clang-format versions
1 parent 3a67fb7 commit 84c6cd8

File tree

7 files changed

+19
-122
lines changed

7 files changed

+19
-122
lines changed

CMakeLists.txt

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6)
1+
cmake_minimum_required(VERSION 3.0)
22

33
project(libbarrett)
44
set(libbarrett_VERSION_MAJOR 3)
@@ -144,10 +144,22 @@ add_subdirectory(src)
144144
# Only files that are substantially different from upstream libbarrett should
145145
# be formatted.
146146
include(ClangFormat)
147-
clang_format_setup(VERSION 3.8)
147+
clang_format_setup(VERSION 14)
148148

149149
if (CLANG_FORMAT_EXECUTABLE)
150-
clang_format_add_sources(programs/autotension.cpp)
150+
file(GLOB_RECURSE ALL_SOURCE_FILES
151+
LIST_DIRECTORIES false
152+
include/*.h
153+
include/*.hpp
154+
src/*.c
155+
src/*.cpp
156+
tests/*.cpp
157+
tests/*.hpp
158+
tests/*.h
159+
programs/*.cpp
160+
examples/*.h
161+
examples/*.cpp)
162+
clang_format_add_sources(${ALL_SOURCE_FILES})
151163
clang_format_add_targets()
152164
endif()
153165

cmake/modules/FindEigen2.cmake

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

cmake/modules/FindEigen3.cmake

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

examples/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6)
1+
cmake_minimum_required(VERSION 3.0)
22
project(libbarrett_examples)
33

44

sandbox/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6)
1+
cmake_minimum_required(VERSION 3.0)
22
project(libbarrett_sandbox)
33

44

sandbox/feather_touch/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6)
1+
cmake_minimum_required(VERSION 3.0)
22
project(feather_touch)
33

44
## libbarrett

sandbox/teach_and_play/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 2.6)
1+
cmake_minimum_required(VERSION 3.0)
22
project(teach_and_play)
33

44
## libbarrett

0 commit comments

Comments
 (0)