Skip to content
Snippets Groups Projects
Commit e47742c1 authored by Andrea Formica's avatar Andrea Formica
Browse files

Merge branch 'auto-fix-branch' into 'release-6.2-CR1'

Auto fix branch

See merge request !59
parents 04756548 0f4c4d10
No related branches found
No related tags found
3 merge requests!62Release 6.2 cr1,!59Auto fix branch,!58errors in CrestContainer corrected
Pipeline #11692708 passed
......@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.12)
project(CrestContainer VERSION 6.1 LANGUAGES CXX)
# Find the necessary externals.
find_package(CrestApi 6.1 REQUIRED)
#find_package(CrestApi 6.1 REQUIRED)
# Set the C++ standard to use.
......@@ -48,7 +48,7 @@ target_link_libraries(CrestContainerLib
CURL::libcurl
Boost::boost
nlohmann_json::nlohmann_json
CrestApi::CrestApiLib
CrestApiLib
PRIVATE
OpenSSL::SSL
)
......
......@@ -4,6 +4,7 @@
#include "CrestContainer.h"
#include <CrestApi/CrestCondException.h>
#include <stdarg.h>
#include <boost/algorithm/string.hpp>
......@@ -13,8 +14,6 @@
#include <fstream>
#include <iomanip>
#include "CrestApi/CrestCondException.h"
using json = nlohmann::json;
Crest::CrestContainer::CrestContainer(Crest::ModeId mode) : m_modeId(mode) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment