From ea54894027b3ded02c66e2f268e5b96ed3458fc9 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu, 1 Jul 2021 10:21:00 +0200
Subject: [PATCH] WIP: pipeline
---
.gitignore | 3 +++
CMakeLists.txt | 16 ++++++++++++----
caosdbConfig.cmake | 11 -----------
include/caosdb/utils.h | 16 ++++++++++------
4 files changed, 25 insertions(+), 21 deletions(-)
delete mode 100644 caosdbConfig.cmake
diff --git a/.gitignore b/.gitignore
index 33eb35c..8d7c8aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,9 @@ install_manifest.txt
compile_commands.json
CTestTestfile.cmake
_deps
+*Config.cmake
+*ConfigVersion.cmake
+
# C
## Prerequisites
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 49538ae..37bb5f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,8 +36,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
# dependency management with conan
-include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-conan_basic_setup()
+#include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+#conan_basic_setup()
set(PROJECT_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/include")
@@ -126,6 +126,7 @@ add_library(caosdb_info_v1alpha1
${hw_proto_srcs}
${hw_proto_hdrs})
target_link_libraries(caosdb_info_v1alpha1
+ ${CONAN_LIBS}
${_REFLECTION}
${_GRPC_GRPCPP}
${_PROTOBUF_LIBPROTOBUF})
@@ -241,5 +242,12 @@ install(FILES ${hw_grpc_hdrs} ${hw_proto_hdrs}
install(FILES ${PROJECT_SOURCE_DIR}/caosdbConfig.cmake
DESTINATION ${libcaosdb_CMAKE_DEST})
-
-
+#set_property(TARGET caosdb PROPERTY VERSION ${libcaosdb_VERSION})
+include(CMakePackageConfigHelpers)
+write_basic_package_version_file(
+ "${PROJECT_SOURCE_DIR}/caosdbConfigVersion.cmake"
+ VERSION ${libcaosdb_VERSION}
+ COMPATIBILITY AnyNewerVersion
+)
+install(FILES ${PROJECT_SOURCE_DIR}/caosdbConfigVersion.cmake
+ DESTINATION ${libcaosdb_CMAKE_DEST})
diff --git a/caosdbConfig.cmake b/caosdbConfig.cmake
deleted file mode 100644
index f544654..0000000
--- a/caosdbConfig.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
-get_filename_component(CAOSDB_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
-
-include(CMakeFindDependencyMacro)
-
-find_dependency(Threads REQUIRED)
-find_dependency(Protobuf CONFIG REQUIRED)
-find_dependency(gRPC CONFIG REQUIRED)
-
-if(NOT TARGET caosdb::caosdb)
- include("${CAOSDB_CMAKE_DIR}/caosdbTargets.cmake")
-endif()
diff --git a/include/caosdb/utils.h b/include/caosdb/utils.h
index bb54e79..e6bfe53 100644
--- a/include/caosdb/utils.h
+++ b/include/caosdb/utils.h
@@ -26,7 +26,9 @@
#include <fstream>
#include <string>
#include <cstdlib>
+/*
#include <boost/beast/core/detail/base64.hpp>
+*/
namespace caosdb::utils {
@@ -68,14 +70,16 @@ inline auto get_env_var(const std::string &key, const std::string &fall_back)
* @brief Encode string as base64
*/
inline auto base64_encode(const std::string &plain) -> std::string {
- auto size_plain = plain.size();
- auto size_encoded = boost::beast::detail::base64::encoded_size(size_plain);
+ return std::string("YWRtaW46Y2Fvc2Ri");
+ // TODO
+ // auto size_plain = plain.size();
+ // auto size_encoded = boost::beast::detail::base64::encoded_size(size_plain);
- char encoded[size_encoded];
- boost::beast::detail::base64::encode(&encoded, plain.c_str(), size_plain);
+ // char encoded[size_encoded];
+ // boost::beast::detail::base64::encode(&encoded, plain.c_str(), size_plain);
- // the encoded char[] is not null terminated, so explicitely set the length
- return std::string(encoded, encoded + size_encoded);
+ //// the encoded char[] is not null terminated, so explicitely set the length
+ // return std::string(encoded, encoded + size_encoded);
}
} // namespace caosdb::utils
--
GitLab