Skip to content

Commit

Permalink
(#4176) [mongo-cxx-driver] remove wrong includedirs
Browse files Browse the repository at this point in the history
Thanks to @andoalon for reporting the issue and fix
  • Loading branch information
mathbunnyru authored Jan 10, 2021
1 parent edb7b4e commit 367dc90
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 0 additions & 2 deletions recipes/mongo-cxx-driver/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ def package_info(self):
self.cpp_info.components["mongocxx"].names["cmake_find_package"] = "mongocxx_shared" if self.options.shared else "mongocxx_static"
self.cpp_info.components["mongocxx"].names["cmake_find_package_multi"] = "mongocxx_shared" if self.options.shared else "mongocxx_static"
self.cpp_info.components["mongocxx"].names["pkg_config"] = "libmongocxx"
self.cpp_info.components["mongocxx"].includedirs = [os.path.join("include", "lib", "v_noabi", "mongocxx")]
self.cpp_info.components["mongocxx"].libs = ["mongocxx" if self.options.shared else "mongocxx-static"]
if not self.options.shared:
self.cpp_info.components["mongocxx"].defines.append("MONGOCXX_STATIC")
Expand All @@ -196,7 +195,6 @@ def package_info(self):
self.cpp_info.components["bsoncxx"].names["cmake_find_package"] = "bsoncxx_shared" if self.options.shared else "bsoncxx_static"
self.cpp_info.components["bsoncxx"].names["cmake_find_package_multi"] = "bsoncxx_shared" if self.options.shared else "bsoncxx_static"
self.cpp_info.components["bsoncxx"].names["pkg_config"] = "libbsoncxx" if self.options.shared else "libbsoncxx-static"
self.cpp_info.components["bsoncxx"].includedirs = [os.path.join("include", "lib", "v_noabi", "bsoncxx")]
self.cpp_info.components["bsoncxx"].libs = ["bsoncxx" if self.options.shared else "bsoncxx-static"]
if not self.options.shared:
self.cpp_info.components["bsoncxx"].defines = ["BSONCXX_STATIC"]
Expand Down
2 changes: 1 addition & 1 deletion recipes/mongo-cxx-driver/all/test_package/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1)
project(test_package)

include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
conan_basic_setup()
conan_basic_setup(TARGETS)

find_package(mongocxx REQUIRED CONFIG)

Expand Down

0 comments on commit 367dc90

Please sign in to comment.