diff --git a/sdk/cmake/CMakeMacros.cmake b/sdk/cmake/CMakeMacros.cmake
index f254ce3f054..7e4cb21cbe0 100644
--- a/sdk/cmake/CMakeMacros.cmake
+++ b/sdk/cmake/CMakeMacros.cmake
@@ -287,10 +287,10 @@ function(add_cd_file)
     endif()
 
     # do we add it to all CDs?
-    list(FIND _CD_FOR all __cd)
+    list(FIND _CD_FOR "all" __cd)
     if(NOT __cd EQUAL -1)
-        list(REMOVE_AT _CD_FOR __cd)
-        list(INSERT _CD_FOR __cd "bootcd;livecd;regtest")
+        list(REMOVE_ITEM _CD_FOR "all")
+        list(APPEND _CD_FOR "bootcd;livecd;regtest")
     endif()
 
     # do we add it to bootcd?