detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 05:17:13 +02:00
Code Issues Actions Packages Releases Activity

cmake3 in cmk.sh and removed warnings

Browse Source
This commit is contained in:
maliakal_d
2019-04-03 16:03:19 +02:00
parent 1558ca2bb5
commit bb025adc09
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmk.sh
View File

@ -178,7 +178,7 @@ echo "in "$PWD
#cmake #cmake
if [ $REBUILD -eq 1 ]; then if [ $REBUILD -eq 1 ]; then
rm -f CMakeCache.txt rm -f CMakeCache.txt
BUILDCOMMAND="$CMAKE_PRE cmake $CMAKE_POST .." BUILDCOMMAND="$CMAKE_PRE cmake3 $CMAKE_POST .."
echo $BUILDCOMMAND echo $BUILDCOMMAND
eval $BUILDCOMMAND eval $BUILDCOMMAND
fi fi

12
slsSupportLib/include/ZmqSocket.h
View File

@ -262,19 +262,19 @@ public:
"{" "{"
"\"jsonversion\":%u, " "\"jsonversion\":%u, "
"\"bitmode\":%u, " "\"bitmode\":%u, "
"\"fileIndex\":%llu, " "\"fileIndex\":%lu, "
"\"shape\":[%u, %u], " "\"shape\":[%u, %u], "
"\"size\":%u, " "\"size\":%u, "
"\"acqIndex\":%llu, " "\"acqIndex\":%lu, "
"\"fIndex\":%llu, " "\"fIndex\":%lu, "
"\"fname\":\"%s\", " "\"fname\":\"%s\", "
"\"data\": %d, " "\"data\": %d, "
"\"frameNumber\":%llu, " "\"frameNumber\":%lu, "
"\"expLength\":%u, " "\"expLength\":%u, "
"\"packetNumber\":%u, " "\"packetNumber\":%u, "
"\"bunchId\":%llu, " "\"bunchId\":%lu, "
"\"timestamp\":%llu, " "\"timestamp\":%lu, "
"\"modId\":%u, " "\"modId\":%u, "
"\"row\":%u, " "\"row\":%u, "
"\"column\":%u, " "\"column\":%u, "