Commit 29d962c4 authored by koennecke's avatar koennecke
Browse files

Added files to make building SICS with cmake work. Based on work by

Douglas from ANSTO
parent 6595dd63
add_library(site
psi.c
buffer.c
ruli.c
sps.c
pimotor.c
pipiezo.c
sanswave.c
faverage.c
spss7.c
amorstat.c
tasinit.c
ptasdrive.c
tasutil.c
tasscan.c
swmotor.c
polterwrite.c
ecb.c
frame.c
sqlitelog.c
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
t_rlp.c
t_conv.c
el737hpdriv.c
el734hp.c
el737hpv2driv.c
swmotor2.c
tricssupport.c
amorcomp.c
amordrive.c
amorset.c
sinqhttp.c
slsecho.c
tabledrive.o
sinqhttpopt.c
ritastorage.c
el737hpdrivsps.c
rebin.c
sanslirebin.c
lmd200.c
slsvme.c
julprot.c
sinqhttpprot.c
pfeifferprot.c
termprot.c
phytron.c
autowin.c
eigera2.c
eigermono.c
sputterprot.c
zwickroll.c
astriumnet.c
poldifold.c
epicsadapter.c
zebraswap.c
fsm.c
sugar.c
pardef.c
ease.c
strobj.c
oxinst.c
ipsdriv.c
ilmdriv.c
itcdriv.c
ighdriv.c
euro2kdriv.c
modbus.c
arrobj.c
linadriv.c
haakedriv.c
seaclientprot.c
dumprot.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")
add_library(hardsup
el734_utility.c
asynsrv_utility.c
stredit.c
strjoin.c
failinet.c
geterrno.c
el737_utility.c
sinqhm.c
serialsinq.c
itc4util.c
dillutil.c
table.c
el755_utility.c
el755_errorlog.c
makeprint.c
StrMatch.c
)
set_property(SOURCE el734_utility.c APPEND PROPERTY COMPILE_FLAGS "-DLINUX")
set_property(SOURCE el737_utility.c APPEND PROPERTY COMPILE_FLAGS "-DLINUX")
include_directories("." ".." "../../sics")
......@@ -67,7 +67,6 @@ void SiteInit(void)
INIT(AddSLSEchoProtocoll);
INIT(AddSeaClientProtocol);
INIT(AddDumProtocol);
INIT(AddJVLProtocoll);
INIT(AddSputterProtocoll);
INIT(AddZwickrollProtocoll);
......
......@@ -535,7 +535,7 @@ static int TASScanPoint(pScanData self, int iPoint)
m4 = GetMonitor(self->pCounterData, 4, self->pCon); // integrated proton charge on target
cnts = GetCounts(self->pCounterData, self->pCon);
fVal = GetCountTime(self->pCounterData, self->pCon);
sprintf(pWork, "%8ld %8ld %9.2f %8ld %8ld %9ld", m1, m2, fVal, cnts, m3, m4);
sprintf(pWork, "%8ld %8ld %9.2f %8ld %8ld %9ld ", m1, m2, fVal, cnts, m3, m4);
strcat(pBueffel, pWork);
/*
......
......@@ -223,6 +223,8 @@ int main(int argc, char *argv[])
}
atexit(StopPico);
SetGenerator(FREQ, AMPL*MULT);
glAmpl = AMPL;
loop = malloc(sizeof(uv_loop_t));
if(loop == NULL){
......
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