clean(cmake): remove not needed lib links

kr-t · kr-t · commit 30d1efaffce5 · 2026-04-20T10:38:43.000+02:00
Zephyr only requires linking zephyr_generated_headers when zephyr/kernel.h
is used. We do it only in platform and ocre_api, which will be obsolete.

Signed-off-by: Krisztian Szilvasi &lt;34309983+kr-t@users.noreply.github.com&gt;
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
@@ -59,8 +59,3 @@ target_include_directories(OcreCommon
     PUBLIC
     include
 )
-
-# Ensure generated headers are ready before compiling
-if(TARGET zephyr_generated_headers)
-    add_dependencies(OcreCommon zephyr_generated_headers)
-endif()
diff --git a/src/ocre/CMakeLists.txt b/src/ocre/CMakeLists.txt
@@ -15,11 +15,6 @@ target_sources(OcreCore
     util/unique_random_id.c
 )
 
-# Ensure generated headers are ready before compiling
-if(TARGET zephyr_generated_headers)
-    add_dependencies(OcreCore zephyr_generated_headers)
-endif()
-
 target_link_libraries(OcreCore
     PRIVATE
     uthash
diff --git a/src/platform/zephyr/CMakeLists.txt b/src/platform/zephyr/CMakeLists.txt
@@ -26,6 +26,4 @@ target_link_libraries(OcrePlatform
 )
 
 # Ensure generated headers are ready before compiling
-if(TARGET zephyr_generated_headers)
-    add_dependencies(OcrePlatform zephyr_generated_headers)
-endif()
+add_dependencies(OcrePlatform zephyr_generated_headers)
diff --git a/src/runtime/wamr-wasip1/CMakeLists.txt b/src/runtime/wamr-wasip1/CMakeLists.txt
@@ -23,9 +23,4 @@ target_link_libraries(OcreRuntimeWamr
     vmlib
 )
 
-# Ensure generated headers are ready before compiling
-if(TARGET zephyr_generated_headers)
-    add_dependencies(OcreRuntimeWamr zephyr_generated_headers)
-endif()
-
 add_subdirectory(ocre_api)
diff --git a/src/samples/demo/zephyr/CMakeLists.txt b/src/samples/demo/zephyr/CMakeLists.txt
@@ -25,11 +25,6 @@ target_sources(app
     ../main.c
 )
 
-# Ensure generated headers are ready before compiling
-if(TARGET zephyr_generated_headers)
-    add_dependencies(app zephyr_generated_headers)
-endif()
-
 target_link_libraries(app
     PUBLIC
     OcreCore
diff --git a/src/samples/supervisor/zephyr/CMakeLists.txt b/src/samples/supervisor/zephyr/CMakeLists.txt
@@ -28,11 +28,6 @@ target_sources(app
     download_file.c
 )
 
-# Ensure generated headers are ready before compiling
-if(TARGET zephyr_generated_headers)
-    add_dependencies(app zephyr_generated_headers)
-endif()
-
 target_link_libraries(app
     PUBLIC
     OcreCore
diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
@@ -36,8 +36,3 @@ target_include_directories(OcreShell
     PUBLIC
     include
 )
-
-# Ensure generated headers are ready before compiling
-if(TARGET zephyr_generated_headers)
-    add_dependencies(OcreShell zephyr_generated_headers)
-endif()
diff --git a/tests/system/zephyr/container/CMakeLists.txt b/tests/system/zephyr/container/CMakeLists.txt
@@ -29,11 +29,6 @@ target_include_directories(Unity PUBLIC
     ../../../../tests/Unity/src
 )
 
-if(TARGET zephyr_generated_headers)
-    add_dependencies(Unity zephyr_generated_headers)
-    add_dependencies(app zephyr_generated_headers)
-endif()
-
 target_sources(app
     PRIVATE
     ../../container.c
diff --git a/tests/system/zephyr/context/CMakeLists.txt b/tests/system/zephyr/context/CMakeLists.txt
@@ -30,11 +30,6 @@ target_include_directories(Unity PUBLIC
     ../../../../tests/Unity/src
 )
 
-if(TARGET zephyr_generated_headers)
-    add_dependencies(Unity zephyr_generated_headers)
-    add_dependencies(app zephyr_generated_headers)
-endif()
-
 target_sources(app
     PRIVATE
     ../../context.c
diff --git a/tests/system/zephyr/input_output/CMakeLists.txt b/tests/system/zephyr/input_output/CMakeLists.txt
@@ -26,11 +26,6 @@ target_include_directories(Unity PUBLIC
     ../../../../tests/Unity/src
 )
 
-if(TARGET zephyr_generated_headers)
-    add_dependencies(Unity zephyr_generated_headers)
-    add_dependencies(app zephyr_generated_headers)
-endif()
-
 target_sources(app
     PRIVATE
     ../../input_output.c
diff --git a/tests/system/zephyr/lib/CMakeLists.txt b/tests/system/zephyr/lib/CMakeLists.txt
@@ -21,11 +21,6 @@ target_include_directories(Unity PUBLIC
     ../../../../tests/Unity/src
 )
 
-if(TARGET zephyr_generated_headers)
-    add_dependencies(Unity zephyr_generated_headers)
-    add_dependencies(app zephyr_generated_headers)
-endif()
-
 target_sources(app
     PRIVATE
     ../../lib.c
diff --git a/tests/system/zephyr/ocre/CMakeLists.txt b/tests/system/zephyr/ocre/CMakeLists.txt
@@ -21,11 +21,6 @@ target_include_directories(Unity PUBLIC
     ../../../../tests/Unity/src
 )
 
-if(TARGET zephyr_generated_headers)
-    add_dependencies(Unity zephyr_generated_headers)
-    add_dependencies(app zephyr_generated_headers)
-endif()
-
 target_sources(app
     PRIVATE
     ../../ocre.c
diff --git a/zephyr/wamr.cmake b/zephyr/wamr.cmake
@@ -86,9 +86,8 @@ target_sources(vmlib PRIVATE
 # Ensure generated headers (e.g. heap_constants.h) are ready before compiling
 # the library. Zephyr adds this dependency for its own libraries automatically,
 # but parallel builds can race when the library is added via add_subdirectory.
-if(TARGET zephyr_generated_headers)
-    add_dependencies(vmlib zephyr_generated_headers)
-endif()
+add_dependencies(vmlib zephyr_generated_headers)
+
 target_link_libraries(vmlib zephyr_interface LITTLEFS)
 
 get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)

Original file line number	Diff line number	Diff line change
`@@ -59,8 +59,3 @@ target_include_directories(OcreCommon`
`59`	`59`	`PUBLIC`
`60`	`60`	`include`
`61`	`61`	`)`
`62`		`-`
`63`		`-# Ensure generated headers are ready before compiling`
`64`		`-if(TARGET zephyr_generated_headers)`
`65`		`- add_dependencies(OcreCommon zephyr_generated_headers)`
`66`		`-endif()`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,4 @@ target_link_libraries(OcrePlatform`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`# Ensure generated headers are ready before compiling`
`29`		`-if(TARGET zephyr_generated_headers)`
`30`		`- add_dependencies(OcrePlatform zephyr_generated_headers)`
`31`		`-endif()`
	`29`	`+add_dependencies(OcrePlatform zephyr_generated_headers)`
Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,4 @@ target_link_libraries(OcreRuntimeWamr`
`23`	`23`	`vmlib`
`24`	`24`	`)`
`25`	`25`
`26`		`-# Ensure generated headers are ready before compiling`
`27`		`-if(TARGET zephyr_generated_headers)`
`28`		`- add_dependencies(OcreRuntimeWamr zephyr_generated_headers)`
`29`		`-endif()`
`30`		`-`
`31`	`26`	`add_subdirectory(ocre_api)`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,3 @@ target_include_directories(OcreShell`
`36`	`36`	`PUBLIC`
`37`	`37`	`include`
`38`	`38`	`)`
`39`		`-`
`40`		`-# Ensure generated headers are ready before compiling`
`41`		`-if(TARGET zephyr_generated_headers)`
`42`		`- add_dependencies(OcreShell zephyr_generated_headers)`
`43`		`-endif()`