diff --git a/conanfile.py b/conanfile.py index dda88a0ae0967131c90ea3e32b33779e66c69e6d..ea6574fd7d1fa18786c638751eafa187398ec9a8 100644 --- a/conanfile.py +++ b/conanfile.py @@ -14,13 +14,12 @@ class LibcaosdbConan(ConanFile): default_options = {"shared": False, "fPIC": True} generators = "cmake" requires = [("boost/1.76.0"), ("gtest/1.11.0"), ("grpc/1.38.0")] - exports = "*.cpp", "*h" + exports = "*.cpp", "*h", "*.cmake", "*CMakeLists.txt", "*.in", "*.proto" + exports_sources = "src", "doc", "include", "test", "cmake", "proto" def config_options(self): if self.settings.os == "Windows": del self.options.fPIC - elif self.settings.get_safe("compiler.libcxx") is not None: - self.settings.compiler.libcxx = "libstdc++11" def source(self): self.run("git clone https://gitlab.indiscale.com/caosdb/src/caosdb-cpplib.git") @@ -31,7 +30,7 @@ class LibcaosdbConan(ConanFile): def build(self): cmake = CMake(self) - cmake.configure(source_folder="src") + cmake.configure(source_folder="") cmake.build() # Explicit way: @@ -41,7 +40,6 @@ class LibcaosdbConan(ConanFile): def package(self): self.copy("*.h", dst="include", src="include") - self.copy("*hello.lib", dst="lib", keep_path=False) self.copy("*.dll", dst="bin", keep_path=False) self.copy("*.so", dst="lib", keep_path=False) self.copy("*.dylib", dst="lib", keep_path=False) diff --git a/test_package/example.cpp b/test_package/example.cpp index 0d25749547ac289a83332ba12e9a36cfa7980748..99216484d65cccaae3946a2ce3c9f99e9a7dadda 100644 --- a/test_package/example.cpp +++ b/test_package/example.cpp @@ -1,5 +1,8 @@ -#include "hello.h" +#include <iostream> +#include "caosdb/connection.h" int main() { - hello(); + caosdb::connection::InsecureCaosDBConnectionConfig config("localhost", 8443); + + std::cout << config << "\n"; }