samples: Fix abuse of not including bootutil library

Fixes abuse of code where it wrongly assumed a library would
just be available due to wrong code added to another repo that
did always wrongly include a library when it should not have done

Signed-off-by: Jamie McCrae <[email protected]>

Author: nordicjm

samples/cellular/lwm2m_client/src/fota_external/CMakeLists.txt

@@ -4,7 +4,8 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-zephyr_include_directories(include)
-
-target_sources_ifdef(CONFIG_APP_SMP_CLIENT_FOTA_EXTERNAL
-	app PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/client.c)
+if(CONFIG_APP_SMP_CLIENT_FOTA_EXTERNAL)
+  zephyr_sources(${CMAKE_CURRENT_SOURCE_DIR}/client.c)
+  zephyr_include_directories(include)
+  zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)
+endif()

subsys/dfu/dfu_target/CMakeLists.txt

@@ -27,12 +27,18 @@ zephyr_library_sources_ifdef(CONFIG_DFU_TARGET_SMP
   src/dfu_target_smp.c
   )
 zephyr_library_sources(src/dfu_stream_flatten.c)
-if (CONFIG_DFU_TARGET_SUIT)
+
+if(CONFIG_DFU_TARGET_SMP OR CONFIG_DFU_TARGET_MCUBOOT)
+  zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)
+endif()
+
+if(CONFIG_DFU_TARGET_SUIT)
   zephyr_library_sources(src/dfu_target_suit.c)
   zephyr_library_link_libraries(suit_memory_layout_interface)
   zephyr_library_link_libraries(suit_envelope_info)
   zephyr_library_link_libraries_ifdef(CONFIG_SUIT_CACHE_RW suit_cache_interface)
-  if (CONFIG_SSF_SUIT_SERVICE_ENABLED)
+
+  if(CONFIG_SSF_SUIT_SERVICE_ENABLED)
     zephyr_library_link_libraries(suit_utils)
   endif()
 endif()

subsys/net/lib/fota_download/CMakeLists.txt

@@ -30,3 +30,7 @@ zephyr_include_directories_ifdef(CONFIG_SECURE_BOOT
   ${ZEPHYR_NRF_MODULE_DIR}/subsys/dfu/include)
 zephyr_include_directories_ifdef(CONFIG_DOWNLOADER
   ${ZEPHYR_NRF_MODULE_DIR}/subsys/net/lib/downloader/include)
+
+if(CONFIG_MCUBOOT_IMG_MANAGER)
+  zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)
+endif()

subsys/net/lib/mcumgr_smp_client/CMakeLists.txt

@@ -12,4 +12,5 @@ zephyr_library_sources_ifdef(CONFIG_NRF_MCUMGR_SMP_CLIENT_SHELL
   src/mcumgr_smp_client_shell.c
   )
 
-zephyr_include_directories(./include)
+zephyr_library_link_libraries(MCUBOOT_BOOTUTIL)
+zephyr_include_directories(include)