Skip to content
Snippets Groups Projects
Commit 87fd840b authored by Joscha Schmiedt's avatar Joscha Schmiedt
Browse files

Remove boost::test due to conflict with gtest

parent 608b11b5
Branches
Tags
2 merge requests!61Release 0.3.0,!49Resolve "EXTERN: Adapt to Conan 2"
...@@ -43,6 +43,7 @@ class CaosdbConan(ConanFile): ...@@ -43,6 +43,7 @@ class CaosdbConan(ConanFile):
if self.settings.os == "Windows": if self.settings.os == "Windows":
self.options.rm_safe("fPIC") self.options.rm_safe("fPIC")
self.options["boost"].without_python = True self.options["boost"].without_python = True
self.options["boost"].without_test = True
self.options["boost"].filesystem_version = "3" self.options["boost"].filesystem_version = "3"
def generate(self): def generate(self):
...@@ -82,6 +83,7 @@ class CaosdbConan(ConanFile): ...@@ -82,6 +83,7 @@ class CaosdbConan(ConanFile):
def package_info(self): def package_info(self):
self.cpp_info.libs = ["caosdb", "ccaosdb"] self.cpp_info.libs = ["caosdb", "ccaosdb"]
self.cpp_info.requires = ["boost::headers"]
def validate(self): def validate(self):
if self.settings.os not in ("Linux", "Windows"): if self.settings.os not in ("Linux", "Windows"):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment