diff --git a/conanfile.py b/conanfile.py index ea6574fd7d1fa18786c638751eafa187398ec9a8..f9716991017dd62eab2289ca90048ee7311ed946 100644 --- a/conanfile.py +++ b/conanfile.py @@ -1,9 +1,9 @@ from conans import ConanFile, CMake, tools -class LibcaosdbConan(ConanFile): +class CaosdbConan(ConanFile): name = "libcaosdb" - version = "0.0.1" + version = "0.0.2" license = "AGPL-3.0-or-later" author = "Timm C. Fitschen <t.fitschen@indiscale.com>" url = "https://gitlab.indiscale.com/caosdb/src/caosdb-cpplib.git" @@ -21,8 +21,9 @@ class LibcaosdbConan(ConanFile): if self.settings.os == "Windows": del self.options.fPIC - def source(self): - self.run("git clone https://gitlab.indiscale.com/caosdb/src/caosdb-cpplib.git") + # def source(self): + # self.run("git clone https://gitlab.indiscale.com/caosdb/src/caosdb-cpplib.git") + # self.run("cd caosdb-cpplib && git submodule update --init") def imports(self): self.copy("protoc*", "build_tools", "bin") diff --git a/test_package/CMakeLists.txt b/test_package/CMakeLists.txt deleted file mode 100644 index c575fe04f4d60b7ba01b60b0e3865538f4a1b677..0000000000000000000000000000000000000000 --- a/test_package/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -cmake_minimum_required(VERSION 3.1) -project(PackageTest CXX) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup() - -add_executable(example example.cpp) -target_link_libraries(example ${CONAN_LIBS}) - -# CTest is a testing tool that can be used to test your project. -# enable_testing() -# add_test(NAME example -# WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bin -# COMMAND example) diff --git a/test_package/conanfile.py b/test_package/conanfile.py deleted file mode 100644 index fb6117e7b469a0648c1418b13b7b63e7cdc179f5..0000000000000000000000000000000000000000 --- a/test_package/conanfile.py +++ /dev/null @@ -1,25 +0,0 @@ -import os - -from conans import ConanFile, CMake, tools - - -class LibcaosdbTestConan(ConanFile): - settings = "os", "compiler", "build_type", "arch" - generators = "cmake" - - def build(self): - cmake = CMake(self) - # Current dir is "test_package/build/<build_id>" and CMakeLists.txt is - # in "test_package" - cmake.configure() - cmake.build() - - def imports(self): - self.copy("*.dll", dst="bin", src="bin") - self.copy("*.dylib*", dst="bin", src="lib") - self.copy('*.so*', dst='bin', src='lib') - - def test(self): - if not tools.cross_building(self): - os.chdir("bin") - self.run(".%sexample" % os.sep) diff --git a/test_package/example.cpp b/test_package/example.cpp deleted file mode 100644 index 99216484d65cccaae3946a2ce3c9f99e9a7dadda..0000000000000000000000000000000000000000 --- a/test_package/example.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include <iostream> -#include "caosdb/connection.h" - -int main() { - caosdb::connection::InsecureCaosDBConnectionConfig config("localhost", 8443); - - std::cout << config << "\n"; -}