Skip to content

Commit 3c25130

Browse files
Feature/add missing packageproject options (#524)
* Add missing packageproject options * Fix typos with codespell * Update test/style/CMakeLists.txt Co-authored-by: Lars Melchior <TheLartians@users.noreply.github.com> * fix-cmake-format --------- Co-authored-by: Lars Melchior <TheLartians@users.noreply.github.com>
1 parent 369f131 commit 3c25130

File tree

8 files changed

+14
-10
lines changed

8 files changed

+14
-10
lines changed

cmake/.cmake-format-additional_commands-cpm

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,16 @@ parse:
5252
kwargs:
5353
NAME: 1
5454
VERSION: 1
55+
NAMESPACE: 1
5556
INCLUDE_DIR: 1
5657
INCLUDE_DESTINATION: 1
58+
INCLUDE_HEADER_PATTERN: 1
5759
BINARY_DIR: 1
5860
COMPATIBILITY: 1
5961
VERSION_HEADER: 1
62+
EXPORT_HEADER: 1
63+
DISABLE_VERSION_SUFFIX: 1
64+
CPACK: 1
6065
DEPENDENCIES: +
6166
cpmusepackagelock:
6267
pargs: 1

cmake/testing.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ function(ASSERT_DEFINED KEY)
3232
if(DEFINED ${KEY})
3333
message(STATUS "test passed: '${KEY}' is defined")
3434
else()
35-
message(FATAL_ERROR "assertion failed: '${KEY}' is not defiend")
35+
message(FATAL_ERROR "assertion failed: '${KEY}' is not defined")
3636
endif()
3737
endfunction()
3838

3939
function(ASSERT_NOT_DEFINED KEY)
4040
if(DEFINED ${KEY})
41-
message(FATAL_ERROR "assertion failed: '${KEY}' is defiend (${${KEY}})")
41+
message(FATAL_ERROR "assertion failed: '${KEY}' is defined (${${KEY}})")
4242
else()
4343
message(STATUS "test passed: '${KEY}' is not defined")
4444
endif()

examples/entt/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ include(../../cmake/CPM.cmake)
99
CPMAddPackage(
1010
NAME EnTT
1111
VERSION 3.1.1
12-
GITHUB_REPOSITORY skypjack/entt
13-
# EnTT's CMakeLists screws with configuration options
12+
GITHUB_REPOSITORY skypjack/entt # EnTT's CMakeLists screws with configuration options
1413
DOWNLOAD_ONLY True
1514
)
1615

examples/linenoise/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ int main(int argc, char **argv) {
5656
int len = atoi(line + 11);
5757
linenoiseHistorySetMaxLen(len);
5858
} else if (line[0] == '/') {
59-
printf("Unreconized command: %s\n", line);
59+
printf("Unrecognized command: %s\n", line);
6060
}
6161
free(line);
6262
}

examples/spdlog/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ include(../../cmake/CPM.cmake)
99
CPMAddPackage("gh:gabime/spdlog@1.8.2")
1010

1111
# spdlog uses fmt and bundles that dependency. If you want to use fmt in your project as well, you
12-
# can let spdlog re-use fmt from CPM.cmake like this:
12+
# can let spdlog reuse fmt from CPM.cmake like this:
1313
#
1414
# cmake-format: off
1515
#

test/integration/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ To run all tests from the repo root execute:
1212
$ ruby test/integration/runner.rb
1313
```
1414

15-
The runner will run all tests and generate a report of the exeuction.
15+
The runner will run all tests and generate a report of the execution.
1616

1717
The current working directory doesn't matter. If you are in `<repo-root>/test/integration`, you can run simply `$ ruby runner.rb`.
1818

@@ -34,7 +34,7 @@ Writing tests makes use of the custom integration test framework in `lib.rb`. It
3434
* There should be no dependency between the test scripts. Each should be executable individually and the order in which multiple ones are executed mustn't matter.
3535
* The class should contain methods, also prefixed with `test_` which will be executed by the framework. In most cases there would be a single test method per class.
3636
* In case there are multiple test methods, they will be executed in the order in which they are defined.
37-
* The test methods should contain assertions which check for the expected state of things at varous points of the test's execution.
37+
* The test methods should contain assertions which check for the expected state of things at various points of the test's execution.
3838

3939
### More
4040

test/integration/lib.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def read_cache
143143
end
144144

145145
class IntegrationTest < Test::Unit::TestCase
146-
self.test_order = :defined # run tests in order of defintion (as opposed to alphabetical)
146+
self.test_order = :defined # run tests in order of definition (as opposed to alphabetical)
147147

148148
def cleanup
149149
# Clear cpm-related env vars which may have been set by the test

test/integration/tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class MyTest < IntegrationTest
1414
end
1515
```
1616

17-
Now we have our test case class, and the single test method that we will require. Let's focus on the method's contents. The integration test framework provides us with a helper class, `Project`, which can be used for this scenario. A project has an assoiciated pair of source and binary directories in the temporary directory and it provides methods to work with them.
17+
Now we have our test case class, and the single test method that we will require. Let's focus on the method's contents. The integration test framework provides us with a helper class, `Project`, which can be used for this scenario. A project has an associated pair of source and binary directories in the temporary directory and it provides methods to work with them.
1818

1919
We start by creating the project:
2020

0 commit comments

Comments
 (0)