🐛 (cmake): Remove ContainerKit from automagically linked libs

Having ContainerKit in automagically linked libs was causing issues when they include one another.
leka · Oct 8, 2021 · 1a09ce1 · 1a09ce1
1 parent 9fb29b1
commit 1a09ce1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -104,14 +104,12 @@ include_directories(BEFORE
 add_subdirectory(${LIBS_DIR}/Utils)
 add_subdirectory(${LIBS_DIR}/LogKit)
 add_subdirectory(${LIBS_DIR}/HelloWorld)
-add_subdirectory(${LIBS_DIR}/ContainerKit)
 add_subdirectory(${LIBS_DIR}/CriticalSection)
 
 link_libraries(
 	Utils
 	LogKit
 	HelloWorld
-	ContainerKit
 	CriticalSection
 )
 

diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
@@ -2,6 +2,7 @@
 # Copyright 2020 APF France handicap
 # SPDX-License-Identifier: Apache-2.0
 
+add_subdirectory(${LIBS_DIR}/ContainerKit)
 add_subdirectory(${LIBS_DIR}/FileManager)
 add_subdirectory(${LIBS_DIR}/FileSystemKit)
 

diff --git a/libs/LogKit/CMakeLists.txt b/libs/LogKit/CMakeLists.txt
@@ -16,6 +16,7 @@ target_sources(LogKit
 
 target_link_libraries(LogKit
 	mbed-os
+	ContainerKit
 )
 
 if (${CMAKE_PROJECT_NAME} STREQUAL "LekaOSUnitTests")

diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
@@ -177,7 +177,6 @@ add_subdirectory(./mocks)
 
 leka_register_unit_tests_for_library(Utils)
 leka_register_unit_tests_for_library(LogKit)
-leka_register_unit_tests_for_library(ContainerKit)
 leka_register_unit_tests_for_library(CriticalSection)
 
 #
@@ -187,7 +186,6 @@ leka_register_unit_tests_for_library(CriticalSection)
 link_libraries(
 	Utils
 	LogKit
-	ContainerKit
 	CriticalSection
 )
 
@@ -217,6 +215,7 @@ leka_register_unit_tests_for_driver(CoreBufferedSerial)
 # Register libraries
 leka_register_unit_tests_for_library(LKAnimationKit)
 leka_register_unit_tests_for_library(LKCalculatorKit)
+leka_register_unit_tests_for_library(ContainerKit)
 leka_register_unit_tests_for_library(FileSystemKit)
 leka_register_unit_tests_for_library(IOKit)
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,6 +16,7 @@ target_sources(LogKit @@
     target_link_libraries(LogKit
     	mbed-os
+    	ContainerKit
     )
     if (${CMAKE_PROJECT_NAME} STREQUAL "LekaOSUnitTests")
@@ Expand Down @@