Commit 01ad204e authored by koennecke's avatar koennecke
Browse files

Got develop branch to compile with cmake

parent c519650b
......@@ -3,7 +3,6 @@ add_library(site
buffer.c
ruli.c
sps.c
pimotor.c
pipiezo.c
sanswave.c
faverage.c
......@@ -21,16 +20,11 @@ add_library(site
mongolog.c
sicslogquery.c
approxidate.c
el737driv.c
sinqhmdriv.c
tdchm.c
sanscook.c
itc4driv.c
itc4.c
bruker.c
ltc11.c
eurodriv.c
el755driv.c
serial.c
scontroller.c
t_update.c
......@@ -46,7 +40,7 @@ add_library(site
amorset.c
sinqhttp.c
slsecho.c
tabledrive.o
tabledrive.c
sinqhttpopt.c
ritastorage.c
el737hpdrivsps.c
......@@ -85,6 +79,7 @@ add_library(site
haakedriv.c
seaclientprot.c
dumprot.c
collectprot.c
)
set_property(SOURCE epicsadapter.c PROPERTY COMPILE_FLAGS "-I{PROJECT_SOURCE_DIR} -I${EPICS_BASE}/include -I${EPICS_BASE}/include/os/Linux")
include_directories("." ".." "../sics" "hardsup")
......
......@@ -8,6 +8,7 @@
#include <stdio.h>
#include <math.h>
#include <lld.h>
#include <dynstring.h>
#include "tabledrive.h"
/*--------------------------------------------------------------------------*/
#define OUTOFSYNC 100
......@@ -913,7 +914,7 @@ int TableDriveAction(SConnection * pCon, SicsInterp * pSics, void *pData,
SCWrite(pCon, pBueffel, eValue);
print = SCEndBuffering(pCon);
if(print != NULL){
SCWrite(pCon,GetCharArray(print), eValue);
SCWrite(pCon,DynStringGetArray(print), eValue);
}
return 1;
} else if (strcmp(argv[1], "info") == 0) {
......@@ -921,7 +922,7 @@ int TableDriveAction(SConnection * pCon, SicsInterp * pSics, void *pData,
tableInfo(self, pCon);
print = SCEndBuffering(pCon);
if (print != NULL) {
SCWrite(pCon, GetCharArray(print), eValue);
SCWrite(pCon, DynStringGetArray(print), eValue);
}
return 1;
} else if (strcmp(argv[1], "orient") == 0) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment