From 11ee742b767e2016c475ead2821fc90547120014 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Fri, 2 Jul 2021 01:36:39 +0200
Subject: [PATCH] WIP: conan
---
conanfile.py | 9 +++++----
test_package/CMakeLists.txt | 14 --------------
test_package/conanfile.py | 25 -------------------------
test_package/example.cpp | 8 --------
4 files changed, 5 insertions(+), 51 deletions(-)
delete mode 100644 test_package/CMakeLists.txt
delete mode 100644 test_package/conanfile.py
delete mode 100644 test_package/example.cpp
diff --git a/conanfile.py b/conanfile.py
index ea6574f..f971699 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 c575fe0..0000000
--- 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 fb6117e..0000000
--- 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 9921648..0000000
--- 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";
-}
--
GitLab