48 Commits

Author SHA1 Message Date
Samuel Debionne
c064dc84ae Add generation and install of CMake packages 2019-02-13 10:45:01 +01:00
031a11c4f7 removed all the warnings and errors from the merge, also removed added -wextra compiler flag, (yet to add additional commands for moench) 2019-02-12 11:09:19 +01:00
a64b34610a merge from developer (without the additional json header implementations) 2019-02-12 09:35:24 +01:00
Erik Frojdh
a1c0d28ddb changed constructor 2019-01-24 11:12:24 +01:00
Erik Frojdh
1b28cc88ff step one project reorganization 2019-01-18 14:41:04 +01:00
Erik Frojdh
68545f2b26 removed pointer in multiSlsDetectorClient 2019-01-16 10:56:51 +01:00
Erik Frojdh
5e032c2c3e added tests for compiler version 2019-01-15 17:03:04 +01:00
Erik Frojdh
7303734b19 removing static libs and changing flags 2019-01-15 16:56:33 +01:00
c1c302f740 removing networkPArameter function complete 2019-01-14 20:42:15 +01:00
Erik Frojdh
c6a597c3ec minor changes and removed W flag not found 2019-01-11 11:07:50 +01:00
06a6d53a3f gotthard, cmakefiles language line removed 2019-01-04 16:34:34 +01:00
Erik Frojdh
2dd8093905 added project to CMakeLists and path for installing 2018-12-17 14:55:19 +01:00
Erik Frojdh
284ce30a81 starting tests 2018-11-28 14:45:50 +01:00
Erik Frojdh
3d40d5d058 format 2018-10-30 14:57:30 +01:00
Erik Frojdh
af550b4c70 Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor 2018-10-30 14:46:19 +01:00
70a1b87603 merge conflict resolved 2018-10-30 14:31:20 +01:00
dfa8cf7381 runs, prints right in reciever 2018-10-30 13:35:20 +01:00
Erik Frojdh
129e12fd97 moved test framework 2018-10-22 11:21:18 +02:00
Erik Frojdh
0070a79838 removed command threaded 2018-10-17 17:35:55 +02:00
Erik Frojdh
4d69b6d3a1 added address sanitizer for debug mode 2018-10-11 14:43:32 +02:00
17a6322f7c receiver runs but does not overwrite due to wx, async doesnt seems parallel problem, acquire gets stuck 2018-10-10 10:12:58 +02:00
Erik Frojdh
2aa7e7d2ff added catch for unit testing 2018-10-03 14:04:40 +02:00
Erik Frojdh
d74a8368b8 commented find pkg png 2018-08-10 14:11:16 +02:00
40c96b5562 Updated Makefiles, Cmakelists.txt to compile slsMultiReceiver properly and with HDF5 and fixed compiler warnings 2018-07-18 12:29:19 +02:00
45de361b22 slsReceiver: added an executable slsMultiReceiver to have the option to have one process create multiple child processes for multiple receivers with configurable tcp port and callback enable 2018-07-06 16:26:29 +02:00
16428f3828 esrf changes: CMake: support to be added and installed as a sub-project:
* Configure zmq as global imported library in slsReceiverSoftware
* Install zmq, necessary if linking to slsReceiver library
2018-04-25 18:24:08 +02:00
cac913831c esrf change: CMake: add support for GCC versions older than 6.1 2018-04-23 12:07:13 +02:00
Erik Frojdh
da010a03d7 added -std=c++98 to CXX flags 2018-04-04 18:07:33 +02:00
64c18469bd release changes, gui compile via anaconda changes 2018-02-27 10:29:56 +01:00
Erik Frojdh
3edac42ed3 remove png 2018-01-25 15:16:56 +01:00
Erik Frojdh
17d26869b5 specific libpng version 2018-01-25 14:32:04 +01:00
Erik Frojdh
933d34590b find png 2018-01-25 13:47:19 +01:00
Dhanya Maliakal
d6a4f83a99 ignore misleading indentation 2017-12-11 11:13:25 +01:00
Dhanya Maliakal
29d66e455d possible to make only certain components of system 2017-12-11 10:51:19 +01:00
Dhanya Maliakal
65b4c69847 REST implementation removed from slsReceiver 2017-12-05 11:03:52 +01:00
Dhanya Maliakal
b020270734 edited cmake to show warnings 2017-11-17 08:46:59 +01:00
Dhanya Maliakal
dedc00f1bd compiling with rflag 2017-11-13 12:28:27 +01:00
Xiaoqiang Wang
634fbc748e compile libraries with -fPIC flag 2017-08-23 16:13:36 +02:00
Dhanya Maliakal
8f1e8b1196 cmake withotu hdf5 2017-08-04 15:40:44 +02:00
Dhanya Maliakal
efd49ae92a removing individual hdf5 path from cmakelists 2017-07-27 13:55:23 +02:00
Xiaoqiang Wang
6cb387e3a8 tab->space reformat 2017-07-27 12:45:27 +02:00
Xiaoqiang Wang
05b32ce26c find hdf5 cxx component 2017-07-27 12:44:21 +02:00
Dhanya Maliakal
1d073b6897 sort of works, but needs simpler fix 2017-07-27 12:07:44 +02:00
Dhanya Maliakal
e360077e09 changes for the cmake 2017-07-27 10:17:55 +02:00
36904db3ca now GUI is compatible with qwt 6.1 2016-09-02 16:28:01 +02:00
61d347b45d FindQwt returns qwt verison
This can be used to check compatibility
2016-09-01 14:42:47 +02:00
0807e130e4 optionally build calibrationWizards 2016-09-01 11:14:29 +02:00
316ed783a8 add cmake configuration 2016-08-31 20:49:58 +02:00