Safer but slower solution, just filter the list for ::@

HEP-SoC · Oct 4, 2024 · 8ecea4f · 8ecea4f
1 parent ad089dc
commit 8ecea4f
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/cmake/utils/socmake_graph.cmake b/cmake/utils/socmake_graph.cmake
@@ -50,10 +50,7 @@ function(__flatten_graph_recursive NODE RET)
     endif()
 
     # Workaround a mechanism described in (https://cmake.org/cmake/help/v3.30/prop_tgt/INTERFACE_LINK_LIBRARIES.html)
-    list(GET LINK_LIBS -1 LAST_LIB)
-    if(LAST_LIB STREQUAL "::@")
-        list(FILTER LINK_LIBS EXCLUDE REGEX "::@")
-    endif()
+    list(FILTER LINK_LIBS EXCLUDE REGEX "::@")
 
     # message("LINK LIBS for lib: ${NODE} are: ${LINK_LIBS}")
     foreach(lib ${LINK_LIBS})
@@ -108,13 +105,9 @@ function(__all_vertices_removed NODE RET)
     endif()
     if(LINK_LIBS STREQUAL "LINK_LIBS-NOTFOUND")
         set(LINK_LIBS "")
-    else()
-        # Workaround a mechanism described in (https://cmake.org/cmake/help/v3.30/prop_tgt/INTERFACE_LINK_LIBRARIES.html)
-        list(GET LINK_LIBS -1 LAST_LIB)
-        if(LAST_LIB STREQUAL "::@")
-            list(FILTER LINK_LIBS EXCLUDE REGEX "::@")
-        endif()
     endif()
+    # Workaround a mechanism described in (https://cmake.org/cmake/help/v3.30/prop_tgt/INTERFACE_LINK_LIBRARIES.html)
+    list(FILTER LINK_LIBS EXCLUDE REGEX "::@")
 
     compare_lists("${RM_LIST}" "${LINK_LIBS}" L_EQ)
     set(${RET} ${L_EQ} PARENT_SCOPE)