Merge remote-tracking branch 'origin/develop' into mueller/master

2022-02-15 16:54:08 +01:00
parent c6c9a02f09 3a6dcdc78e
commit 41b029f12b
43 changed files with 217 additions and 395 deletions
--- a/common/config/CMakeLists.txt
+++ b/common/config/CMakeLists.txt
@ -1,7 +1,7 @@
-target_include_directories(${TARGET_NAME} PRIVATE
+target_include_directories(${OBSW_NAME} PRIVATE
    ${CMAKE_CURRENT_SOURCE_DIR}
 )

-target_sources(${TARGET_NAME} PRIVATE
+target_sources(${OBSW_NAME} PRIVATE
    commonConfig.cpp
 )