[nrf fromlist] cmake: Fix TINYCBOR in a multi-image context

SebastianBoe · SebastianBoe · commit a4db98dff803 · 2019-04-18T16:29:32.000+02:00
Fix the TINYCBOR build scripts to work with multi-image.

Signed-off-by: Sebastian Bøe &lt;sebastian.boe@nordicsemi.no&gt;
diff --git a/boot/zephyr/CMakeLists.txt b/boot/zephyr/CMakeLists.txt
@@ -164,7 +164,7 @@ if(CONFIG_MCUBOOT_SERIAL)
 
   zephyr_link_libraries_ifdef(
 	CONFIG_TINYCBOR
-	TINYCBOR
+	${IMAGE}TINYCBOR
 	)
 
   zephyr_include_directories_ifdef(

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ if(CONFIG_MCUBOOT_SERIAL)`
`164`	`164`
`165`	`165`	`zephyr_link_libraries_ifdef(`
`166`	`166`	`CONFIG_TINYCBOR`
`167`		`- TINYCBOR`
	`167`	`+ ${IMAGE}TINYCBOR`
`168`	`168`	`)`
`169`	`169`
`170`	`170`	`zephyr_include_directories_ifdef(`