Skip to content

Commit d319929

Browse files
authored
chore: merge pull request #40 from threeal/avoid-cpm-package-lock-format
Prevent Formatting of CPM Package Lock File
2 parents 503c358 + 192fd12 commit d319929

File tree

3 files changed

+7
-17
lines changed

3 files changed

+7
-17
lines changed

.cmake-format

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,4 @@
11
{
2-
"additional_commands": {
3-
"cpmdeclarepackage": {
4-
"kwargs": {
5-
"VERSION": 1,
6-
"GITHUB_REPOSITORY": 1,
7-
"SYSTEM": 1,
8-
"EXCLUDE_FROM_ALL": 1
9-
}
10-
}
11-
},
122
"enable_markup": false,
133
"line_width": 120
144
}

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ target_include_directories(example PUBLIC include)
99

1010
if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
1111
include(cmake/CPM.cmake)
12-
cpmusepackagelock(package-lock.cmake)
12+
cpmusepackagelock(package-lock)
1313
cpmgetpackage(Format.cmake)
1414

1515
if(BUILD_TESTING)

package-lock.cmake renamed to package-lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
# This file should be committed to version control
33

44
# Format.cmake
5-
cpmdeclarepackage(
6-
Format.cmake
5+
CPMDeclarePackage(Format.cmake
76
VERSION 1.7.3
87
GITHUB_REPOSITORY TheLartians/Format.cmake
98
SYSTEM YES
10-
EXCLUDE_FROM_ALL YES)
9+
EXCLUDE_FROM_ALL YES
10+
)
1111
# Catch2
12-
cpmdeclarepackage(
13-
Catch2
12+
CPMDeclarePackage(Catch2
1413
VERSION 3.4.0
1514
GITHUB_REPOSITORY catchorg/Catch2
1615
SYSTEM YES
17-
EXCLUDE_FROM_ALL YES)
16+
EXCLUDE_FROM_ALL YES
17+
)

0 commit comments

Comments
 (0)