Merge branch 'developer' into rxrmetadata

This commit is contained in:
2020-09-07 11:53:41 +02:00
11 changed files with 87 additions and 67 deletions

View File

@ -27,7 +27,7 @@ target_include_directories(slsDetectorShared PUBLIC
target_link_libraries(slsDetectorShared
PUBLIC
slsSupportLib
slsSupportStatic
pthread
rt
slsProjectOptions