Merge branch 'developer' into eiger

This commit is contained in:
Dhanya Thattil
2020-06-16 16:55:49 +02:00
committed by GitHub
5 changed files with 23 additions and 23 deletions

View File

@ -58,7 +58,7 @@ target_compile_definitions(eigerDetectorServerSlaveTop_virtual
)
target_link_libraries(eigerDetectorServerSlaveTop_virtual
PUBLIC pthread rt
PUBLIC pthread rt slsProjectCSettings
)
set_target_properties(eigerDetectorServerSlaveTop_virtual PROPERTIES
@ -86,7 +86,7 @@ target_compile_definitions(eigerDetectorServerSlaveBottom_virtual
)
target_link_libraries(eigerDetectorServerSlaveBottom_virtual
PUBLIC pthread rt
PUBLIC pthread rt slsProjectCSettings
)
set_target_properties(eigerDetectorServerSlaveBottom_virtual PROPERTIES