From 49699e77f37ec4b82dfeaa309bfe60f3d8160779 Mon Sep 17 00:00:00 2001
From: amichelotti <amichelotti@lnf.infn.it>
Date: Mon, 24 Oct 2022 21:55:20 +0200
Subject: [PATCH] centos7
---
chaos/common/CMakeLists.txt | 9 +++++----
chaos/common/data/CDataWrapper.cpp | 5 +++--
chaos/common/data/CDataWrapper.h | 1 -
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/chaos/common/CMakeLists.txt b/chaos/common/CMakeLists.txt
index f54f82102..5d21b2458 100644
--- a/chaos/common/CMakeLists.txt
+++ b/chaos/common/CMakeLists.txt
@@ -665,21 +665,22 @@ IF (WIN32)
ENDIF(WIN32)
ENDIF()
-
+SET(EPICS_LIB)
IF(CHAOS_EPICS_SUPPORT)
foreach(elib libCom.a libpvData.a )
#${CMAKE_INSTALL_PREFIX}/lib/linux-x86_64/${elib}
- SET(BUILD_LIBRARY ${elib} ${BUILD_LIBRARY})
+ SET(EPICS_LIB ${EPICS_LIB} ${elib} )
endforeach()
MESG("Adding Epics support ${BUILD_LIBRARY}")
ENDIF()
+
IF (BUILD_FORCE_STATIC )
ADD_LIBRARY(${PROJECT_NAME} STATIC ${common_lib_src})
- TARGET_LINK_LIBRARIES(${PROJECT_NAME} z lz4 ${FrameworkLib} ${BUILD_LIBRARY})
+ TARGET_LINK_LIBRARIES(${PROJECT_NAME} z lz4 ${EPICS_LIB} ${FrameworkLib} ${BUILD_LIBRARY})
ELSE (BUILD_FORCE_STATIC)
ADD_LIBRARY(${PROJECT_NAME} SHARED ${common_lib_src})
set_target_properties(${PROJECT_NAME} PROPERTIES VERSION 1.0.0 SOVERSION 1)
- TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC z lz4 ${FrameworkLib} PRIVATE ${BUILD_LIBRARY})
+ TARGET_LINK_LIBRARIES(${PROJECT_NAME} PUBLIC z lz4 ${EPICS_LIB} ${FrameworkLib} PRIVATE ${BUILD_LIBRARY})
ENDIF (BUILD_FORCE_STATIC)
target_compile_definitions(${PROJECT_NAME} PRIVATE CLING_VIRTUAL_MACHINE=${CLING_VIRTUAL_MACHINE})
diff --git a/chaos/common/data/CDataWrapper.cpp b/chaos/common/data/CDataWrapper.cpp
index b49303644..c65b9a2d2 100644
--- a/chaos/common/data/CDataWrapper.cpp
+++ b/chaos/common/data/CDataWrapper.cpp
@@ -1527,10 +1527,11 @@ int CDataWrapper::setBson(const bson_iter_t* v, const CDataWrapper* val) {
return -1;
}
#ifdef EPICS
+/*
void CDataWrapper::setSerializedData(pvd::PVStructureConstPtr ptr) {
setSerializedData(ptr.get());
-}
+}*/
void CDataWrapper::setSerializedData(pvd::PVUnionConstPtr ptr){
pvd::UnionConstPtr structure_ptr = ptr->getUnion();
@@ -1882,7 +1883,7 @@ void CDataWrapper::decodePVField(epics::pvData::PVFieldConstPtr pv_field){
}
-void CDataWrapper::setSerializedData(const pvd::PVStructure* ptr) {
+void CDataWrapper::setSerializedData(pvd::PVStructureConstPtr ptr) {
pvd::StructureConstPtr structure_ptr = ptr->getStructure();
std::string id = structure_ptr->getID();
diff --git a/chaos/common/data/CDataWrapper.h b/chaos/common/data/CDataWrapper.h
index c75b47128..04af3ad46 100644
--- a/chaos/common/data/CDataWrapper.h
+++ b/chaos/common/data/CDataWrapper.h
@@ -232,7 +232,6 @@ namespace chaos {
#ifdef EPICS
void setSerializedData(epics::pvData::PVStructureConstPtr ptr);
- void setSerializedData(const epics::pvData::PVStructure* ptr);
void setSerializedData(epics::pvData::PVUnionConstPtr ptr);
void decodePVField(epics::pvData::PVFieldConstPtr);
--
GitLab