[ros-diffs] [reactos] 02/06: [CMAKE] Fix invalid usage of list()

[Victor Perevertkin]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4e389a992dc4f517f2a96e...

commit 4e389a992dc4f517f2a96ef92675aeef8ffd73bd
Author:     Victor Perevertkin [e-mail]
AuthorDate: Mon Sep 13 20:13:40 2021 +0300
Commit:     Victor Perevertkin [e-mail]
CommitDate: Tue Sep 14 17:58:22 2021 +0300

[CMAKE] Fix invalid usage of list()

list() functions expects numerical indices for modification operations
    and silently converts everything else to a number (old behaviour).

CMake 3.21 now checks this and throws a warning
---
 sdk/cmake/CMakeMacros.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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?