Skip to content

Commit 6ca1f82

Browse files
committed
Make homeblocks editable.
1 parent c7d8fe4 commit 6ca1f82

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

conanfile.py

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ def layout(self):
6464
self.folders.build = join("build", str(self.settings.build_type))
6565
self.folders.generators = join(self.folders.build, "generators")
6666

67-
self.cpp.source.components["homestore"].includedirs = ["src/include"]
67+
self.cpp.source.includedirs = ["src/include"]
6868

69-
self.cpp.build.components["homestore"].libdirs = ["src/lib/volume"]
69+
self.cpp.build.libdirs = ["src/lib/volume"]
7070

71-
self.cpp.package.components["homestore"].libs = ["homeblocks_volume"]
71+
self.cpp.package.libs = ["homeblocks_volume"]
7272
self.cpp.package.includedirs = ["include"] # includedirs is already set to 'include' by
7373
self.cpp.package.libdirs = ["lib"]
7474

@@ -113,15 +113,10 @@ def package(self):
113113
copy(self, "*.h*", join(self.source_folder, "src", "include"), join(self.package_folder, "include"), keep_path=True)
114114

115115
def package_info(self):
116-
self.cpp_info.components["homestore"].libs = ["homeblocks_volume"]
117-
self.cpp_info.components["homestore"].requires = ["homestore::homestore", "iomgr::iomgr", "sisl::sisl"]
118-
self.cpp_info.components["homeblocks"].requires = ["homestore"]
119-
120-
if self.settings.os == "Linux":
121-
#self.cpp_info.components["homestore"].system_libs.append("pthread")
122-
self.cpp_info.components["memory"].system_libs.append("pthread")
123116
if self.options.sanitize:
124-
self.cpp_info.components["memory"].sharedlinkflags.append("-fsanitize=address")
125-
self.cpp_info.components["memory"].exelinkflags.append("-fsanitize=address")
126-
self.cpp_info.components["memory"].sharedlinkflags.append("-fsanitize=undefined")
127-
self.cpp_info.components["memory"].exelinkflags.append("-fsanitize=undefined")
117+
self.cpp_info.sharedlinkflags.append("-fsanitize=address")
118+
self.cpp_info.exelinkflags.append("-fsanitize=address")
119+
self.cpp_info.sharedlinkflags.append("-fsanitize=undefined")
120+
self.cpp_info.exelinkflags.append("-fsanitize=undefined")
121+
elif self.options.coverage == 'True':
122+
self.cpp_info.libs.append('gcov')

0 commit comments

Comments
 (0)