Skip to content

Commit a5e7ea5

Browse files
committed
🔧 Update conanfile definition to include tests
The conanfile has been updated to include the unit tests in the build process.
1 parent 4b09071 commit a5e7ea5

File tree

1 file changed

+7
-14
lines changed

1 file changed

+7
-14
lines changed

conanfile.py

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class ExpectedConan(ConanFile):
77
# Package Info
88
name = "Expected"
99
version = "0.0.1"
10-
description = "Expect the unexpected"
10+
description = " A lightweight C++11-compatible error-handling mechanism"
1111
url = "https://github.com/bitwizeshift/Expected"
1212
author = "Matthew Rodusek <[email protected]>"
1313
license = "MIT"
@@ -17,7 +17,8 @@ class ExpectedConan(ConanFile):
1717
exports_sources = ( "CMakeLists.txt",
1818
"cmake/*",
1919
"include/*",
20-
"LICENSE" )
20+
"test/*",
21+
"LICENSE")
2122

2223
# Settings
2324
options = {}
@@ -27,26 +28,18 @@ class ExpectedConan(ConanFile):
2728
# Dependencies
2829
build_requires = ("Catch2/2.7.1@catchorg/stable")
2930

30-
31-
def configure_cmake(self):
31+
def package(self):
3232
cmake = CMake(self)
33-
33+
cmake.definitions["EXPECTED_COMPILE_UNIT_TESTS"] = "ON"
3434
cmake.configure()
35-
return cmake
36-
3735

38-
def build(self):
39-
cmake = self.configure_cmake()
36+
# Compile and run the unit tests
4037
cmake.build()
41-
# cmake.test()
38+
cmake.build(target="test")
4239

43-
44-
def package(self):
45-
cmake = self.configure_cmake()
4640
cmake.install()
4741

4842
self.copy(pattern="LICENSE", dst="licenses")
4943

50-
5144
def package_id(self):
5245
self.info.header_only()

0 commit comments

Comments
 (0)