This is an automated email from the ASF dual-hosted git repository.

pnoltes pushed a commit to branch feature/allow_duplicate_bundles_in_container
in repository https://gitbox.apache.org/repos/asf/celix.git

commit 972be34e122096857de5b2a6579b46f5dfe41387
Author: Pepijn Noltes <pepijnnol...@gmail.com>
AuthorDate: Thu Aug 3 20:26:38 2023 +0200

    Remove cmake IN_LIST usage, not broadly supported yet.
---
 cmake/cmake_celix/ContainerPackaging.cmake | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/cmake/cmake_celix/ContainerPackaging.cmake 
b/cmake/cmake_celix/ContainerPackaging.cmake
index b86ef710..5d74a1f4 100644
--- a/cmake/cmake_celix/ContainerPackaging.cmake
+++ b/cmake/cmake_celix/ContainerPackaging.cmake
@@ -437,10 +437,9 @@ function(celix_container_bundles_dir)
 
     set(DEST_DIR "${CONTAINER_LOC}/${BD_DIR_NAME}")
     get_target_property(CLEAN_FILES ${CONTAINER_TARGET} 
"ADDITIONAL_CLEAN_FILES")
-    if (NOT ${DEST_DIR} IN_LIST CLEAN_FILES)
-        list(APPEND CLEAN_FILES ${DEST_DIR})
-        set_target_properties(${CONTAINER_TARGET} PROPERTIES 
"ADDITIONAL_CLEAN_FILES" "${CLEAN_FILES}")
-    endif()
+    list(APPEND CLEAN_FILES ${DEST_DIR})
+    list(REMOVE_DUPLICATES CLEAN_FILES)
+    set_target_properties(${CONTAINER_TARGET} PROPERTIES 
"ADDITIONAL_CLEAN_FILES" "${CLEAN_FILES}")
 
     foreach(BUNDLE IN ITEMS ${BD_BUNDLES})
         if (IS_ABSOLUTE ${BUNDLE} AND EXISTS ${BUNDLE})

Reply via email to