This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a commit to branch feature/579-automatic-dependency-deduction
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to
refs/heads/feature/579-automatic-dependency-deduction by this push:
new f8bb0187 Modularize error injectors.
f8bb0187 is described below
commit f8bb0187282828804cbfc71b5d8dba2a0714261f
Author: PengZheng <[email protected]>
AuthorDate: Sat Jul 15 12:08:34 2023 +0800
Modularize error injectors.
---
bundles/logging/log_helper/CMakeLists.txt | 3 +++
.../logging/log_helper/ei}/CMakeLists.txt | 2 +-
.../log_helper/ei}/include/celix_log_helper_ei.h | 0
.../log_helper/ei}/src/celix_log_helper_ei.cc | 0
libs/dfi/CMakeLists.txt | 3 +++
.../celix_hash_map => dfi/ei}/CMakeLists.txt | 9 +--------
libs/{error_injector => dfi/ei}/dfi/CMakeLists.txt | 2 +-
libs/{error_injector => dfi/ei}/dfi/include/dfi_ei.h | 0
libs/{error_injector => dfi/ei}/dfi/src/dfi_ei.cc | 0
libs/error_injector/CMakeLists.txt | 20 --------------------
libs/framework/CMakeLists.txt | 3 +++
.../celix_hash_map => framework/ei}/CMakeLists.txt | 10 ++--------
.../ei}/celix_bundle/CMakeLists.txt | 2 +-
.../ei}/celix_bundle/include/celix_bundle_ei.h | 0
.../ei}/celix_bundle/src/celix_bundle_ei.cc | 0
.../ei}/celix_bundle_ctx/CMakeLists.txt | 2 +-
.../include/celix_bundle_context_ei.h | 0
.../celix_bundle_ctx/src/celix_bundle_context_ei.cc | 0
libs/utils/CMakeLists.txt | 3 +++
.../celix_hash_map => utils/ei}/CMakeLists.txt | 16 ++++++++--------
.../ei}/celix_array_list/CMakeLists.txt | 2 +-
.../celix_array_list/include/celix_array_list_ei.h | 0
.../ei}/celix_array_list/src/celix_array_list_ei.cc | 0
.../ei}/celix_hash_map/CMakeLists.txt | 2 +-
.../ei}/celix_hash_map/include/celix_hash_map_ei.h | 0
.../ei}/celix_hash_map/src/celix_hash_map_ei.cc | 0
.../ei}/celix_long_hash_map/CMakeLists.txt | 2 +-
.../include/celix_long_hash_map_ei.h | 0
.../src/celix_long_hash_map_ei.cc | 0
.../ei}/celix_properties/CMakeLists.txt | 2 +-
.../celix_properties/include/celix_properties_ei.h | 0
.../ei}/celix_properties/src/celix_properties_ei.cc | 0
.../ei}/celix_threads/CMakeLists.txt | 2 +-
.../ei}/celix_threads/include/celix_threads_ei.h | 0
.../ei}/celix_threads/src/celix_threads_ei.cc | 0
.../ei}/celix_utils/CMakeLists.txt | 2 +-
.../ei}/celix_utils/include/celix_utils_ei.h | 0
.../ei}/celix_utils/src/celix_utils_ei.cc | 0
.../ei}/celix_version/CMakeLists.txt | 2 +-
.../ei}/celix_version/include/celix_version_ei.h | 0
.../ei}/celix_version/src/celix_version_ei.cc | 0
libs/{error_injector => utils/ei}/zip/CMakeLists.txt | 2 +-
.../ei}/zip/include/zip_ei.h | 0
libs/{error_injector => utils/ei}/zip/src/zip_ei.cc | 0
44 files changed, 35 insertions(+), 56 deletions(-)
diff --git a/bundles/logging/log_helper/CMakeLists.txt
b/bundles/logging/log_helper/CMakeLists.txt
index e46eef11..6652e812 100644
--- a/bundles/logging/log_helper/CMakeLists.txt
+++ b/bundles/logging/log_helper/CMakeLists.txt
@@ -48,6 +48,9 @@ if (LOG_HELPER)
add_library(Celix::log_helper ALIAS log_helper)
if (ENABLE_TESTING)
+ if (LINKER_WRAP_SUPPORTED)
+ add_subdirectory(ei)
+ endif ()
add_subdirectory(gtest)
endif ()
endif ()
diff --git a/libs/error_injector/celix_log_helper/CMakeLists.txt
b/bundles/logging/log_helper/ei/CMakeLists.txt
similarity index 93%
rename from libs/error_injector/celix_log_helper/CMakeLists.txt
rename to bundles/logging/log_helper/ei/CMakeLists.txt
index 4c4d00cc..448b8759 100644
--- a/libs/error_injector/celix_log_helper/CMakeLists.txt
+++ b/bundles/logging/log_helper/ei/CMakeLists.txt
@@ -17,7 +17,7 @@
add_library(log_helper_ei STATIC src/celix_log_helper_ei.cc)
-target_include_directories(log_helper_ei PUBLIC
${CMAKE_CURRENT_LIST_DIR}/include)
+target_include_directories(log_helper_ei PUBLIC include)
target_link_libraries(log_helper_ei PUBLIC Celix::error_injector
Celix::log_helper)
# It plays nicely with address sanitizer this way.
target_link_options(log_helper_ei INTERFACE
LINKER:--wrap,celix_logHelper_create)
diff --git a/libs/error_injector/celix_log_helper/include/celix_log_helper_ei.h
b/bundles/logging/log_helper/ei/include/celix_log_helper_ei.h
similarity index 100%
rename from libs/error_injector/celix_log_helper/include/celix_log_helper_ei.h
rename to bundles/logging/log_helper/ei/include/celix_log_helper_ei.h
diff --git a/libs/error_injector/celix_log_helper/src/celix_log_helper_ei.cc
b/bundles/logging/log_helper/ei/src/celix_log_helper_ei.cc
similarity index 100%
rename from libs/error_injector/celix_log_helper/src/celix_log_helper_ei.cc
rename to bundles/logging/log_helper/ei/src/celix_log_helper_ei.cc
diff --git a/libs/dfi/CMakeLists.txt b/libs/dfi/CMakeLists.txt
index bcf2521d..e95c8eda 100644
--- a/libs/dfi/CMakeLists.txt
+++ b/libs/dfi/CMakeLists.txt
@@ -60,6 +60,9 @@ if (CELIX_DFI)
#Alias setup to match external usage
add_library(Celix::dfi ALIAS dfi)
+ if (ENABLE_TESTING AND LINKER_WRAP_SUPPORTED)
+ add_subdirectory(ei)
+ endif ()
if (ENABLE_TESTING)
add_subdirectory(gtest)
endif(ENABLE_TESTING)
diff --git a/libs/error_injector/celix_hash_map/CMakeLists.txt
b/libs/dfi/ei/CMakeLists.txt
similarity index 68%
copy from libs/error_injector/celix_hash_map/CMakeLists.txt
copy to libs/dfi/ei/CMakeLists.txt
index dbef2bb6..f6d2a84c 100644
--- a/libs/error_injector/celix_hash_map/CMakeLists.txt
+++ b/libs/dfi/ei/CMakeLists.txt
@@ -15,11 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-add_library(hash_map_ei STATIC src/celix_hash_map_ei.cc)
-
-target_include_directories(hash_map_ei PUBLIC
${CMAKE_CURRENT_LIST_DIR}/include)
-target_link_libraries(hash_map_ei PUBLIC Celix::error_injector Celix::utils)
-target_link_options(hash_map_ei INTERFACE
- LINKER:--wrap,celix_stringHashMap_create
-)
-add_library(Celix::hash_map_ei ALIAS hash_map_ei)
+add_subdirectory(dfi)
\ No newline at end of file
diff --git a/libs/error_injector/dfi/CMakeLists.txt
b/libs/dfi/ei/dfi/CMakeLists.txt
similarity index 93%
rename from libs/error_injector/dfi/CMakeLists.txt
rename to libs/dfi/ei/dfi/CMakeLists.txt
index 5aac1af9..23608c88 100644
--- a/libs/error_injector/dfi/CMakeLists.txt
+++ b/libs/dfi/ei/dfi/CMakeLists.txt
@@ -17,7 +17,7 @@
add_library(dfi_ei STATIC src/dfi_ei.cc)
-target_include_directories(dfi_ei PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
+target_include_directories(dfi_ei PUBLIC include)
target_link_libraries(dfi_ei PUBLIC Celix::error_injector Celix::dfi)
# It plays nicely with address sanitizer this way.
target_link_options(dfi_ei INTERFACE
diff --git a/libs/error_injector/dfi/include/dfi_ei.h
b/libs/dfi/ei/dfi/include/dfi_ei.h
similarity index 100%
rename from libs/error_injector/dfi/include/dfi_ei.h
rename to libs/dfi/ei/dfi/include/dfi_ei.h
diff --git a/libs/error_injector/dfi/src/dfi_ei.cc
b/libs/dfi/ei/dfi/src/dfi_ei.cc
similarity index 100%
rename from libs/error_injector/dfi/src/dfi_ei.cc
rename to libs/dfi/ei/dfi/src/dfi_ei.cc
diff --git a/libs/error_injector/CMakeLists.txt
b/libs/error_injector/CMakeLists.txt
index 13737f14..bd149b46 100644
--- a/libs/error_injector/CMakeLists.txt
+++ b/libs/error_injector/CMakeLists.txt
@@ -36,26 +36,6 @@ add_subdirectory(sys_shm)
add_subdirectory(socket)
add_subdirectory(pthread)
add_subdirectory(unistd)
-if (BUILD_UTILS)
- add_subdirectory(celix_properties)
- add_subdirectory(celix_utils)
- add_subdirectory(celix_threads)
- add_subdirectory(celix_array_list)
- add_subdirectory(celix_version)
- add_subdirectory(celix_hash_map)
- add_subdirectory(celix_long_hash_map)
- add_subdirectory(zip)
-endif ()
-if (BUILD_FRAMEWORK)
- add_subdirectory(celix_bundle_ctx)
- add_subdirectory(celix_bundle)
-endif ()
-if (BUILD_LOG_HELPER)
- add_subdirectory(celix_log_helper)
-endif ()
-if (BUILD_CELIX_DFI)
- add_subdirectory(dfi)
-endif ()
celix_subproject(ERROR_INJECTOR_MDNSRESPONDER "Option to enable building the
mdnsresponder error injector" OFF)
if (ERROR_INJECTOR_MDNSRESPONDER)
add_subdirectory(mdnsresponder)
diff --git a/libs/framework/CMakeLists.txt b/libs/framework/CMakeLists.txt
index b25c48fe..4f71478f 100644
--- a/libs/framework/CMakeLists.txt
+++ b/libs/framework/CMakeLists.txt
@@ -73,6 +73,9 @@ if (FRAMEWORK)
#Alias setup to match external usage
add_library(Celix::framework ALIAS framework)
+ if (ENABLE_TESTING AND LINKER_WRAP_SUPPORTED)
+ add_subdirectory(ei)
+ endif ()
if (ENABLE_TESTING AND CELIX_CXX17) #framework tests are C++17
add_library(framework_cut STATIC ${FRAMEWORK_SRC})
target_include_directories(framework_cut PUBLIC
diff --git a/libs/error_injector/celix_hash_map/CMakeLists.txt
b/libs/framework/ei/CMakeLists.txt
similarity index 68%
copy from libs/error_injector/celix_hash_map/CMakeLists.txt
copy to libs/framework/ei/CMakeLists.txt
index dbef2bb6..636a6853 100644
--- a/libs/error_injector/celix_hash_map/CMakeLists.txt
+++ b/libs/framework/ei/CMakeLists.txt
@@ -15,11 +15,5 @@
# specific language governing permissions and limitations
# under the License.
-add_library(hash_map_ei STATIC src/celix_hash_map_ei.cc)
-
-target_include_directories(hash_map_ei PUBLIC
${CMAKE_CURRENT_LIST_DIR}/include)
-target_link_libraries(hash_map_ei PUBLIC Celix::error_injector Celix::utils)
-target_link_options(hash_map_ei INTERFACE
- LINKER:--wrap,celix_stringHashMap_create
-)
-add_library(Celix::hash_map_ei ALIAS hash_map_ei)
+add_subdirectory(celix_bundle_ctx)
+add_subdirectory(celix_bundle)
\ No newline at end of file
diff --git a/libs/error_injector/celix_bundle/CMakeLists.txt
b/libs/framework/ei/celix_bundle/CMakeLists.txt
similarity index 93%
rename from libs/error_injector/celix_bundle/CMakeLists.txt
rename to libs/framework/ei/celix_bundle/CMakeLists.txt
index 1c0a7d81..97eb8e2c 100644
--- a/libs/error_injector/celix_bundle/CMakeLists.txt
+++ b/libs/framework/ei/celix_bundle/CMakeLists.txt
@@ -17,7 +17,7 @@
add_library(bundle_ei STATIC src/celix_bundle_ei.cc)
-target_include_directories(bundle_ei PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
+target_include_directories(bundle_ei PUBLIC include)
target_link_libraries(bundle_ei PUBLIC Celix::error_injector)
target_link_libraries(bundle_ei PRIVATE Celix::framework)
diff --git a/libs/error_injector/celix_bundle/include/celix_bundle_ei.h
b/libs/framework/ei/celix_bundle/include/celix_bundle_ei.h
similarity index 100%
rename from libs/error_injector/celix_bundle/include/celix_bundle_ei.h
rename to libs/framework/ei/celix_bundle/include/celix_bundle_ei.h
diff --git a/libs/error_injector/celix_bundle/src/celix_bundle_ei.cc
b/libs/framework/ei/celix_bundle/src/celix_bundle_ei.cc
similarity index 100%
rename from libs/error_injector/celix_bundle/src/celix_bundle_ei.cc
rename to libs/framework/ei/celix_bundle/src/celix_bundle_ei.cc
diff --git a/libs/error_injector/celix_bundle_ctx/CMakeLists.txt
b/libs/framework/ei/celix_bundle_ctx/CMakeLists.txt
similarity index 95%
rename from libs/error_injector/celix_bundle_ctx/CMakeLists.txt
rename to libs/framework/ei/celix_bundle_ctx/CMakeLists.txt
index fed75fbe..cab4abc2 100644
--- a/libs/error_injector/celix_bundle_ctx/CMakeLists.txt
+++ b/libs/framework/ei/celix_bundle_ctx/CMakeLists.txt
@@ -17,7 +17,7 @@
add_library(bundle_ctx_ei STATIC src/celix_bundle_context_ei.cc)
-target_include_directories(bundle_ctx_ei PUBLIC
${CMAKE_CURRENT_LIST_DIR}/include)
+target_include_directories(bundle_ctx_ei PUBLIC include)
target_link_libraries(bundle_ctx_ei PUBLIC Celix::error_injector)
target_link_libraries(bundle_ctx_ei PRIVATE Celix::framework)
diff --git
a/libs/error_injector/celix_bundle_ctx/include/celix_bundle_context_ei.h
b/libs/framework/ei/celix_bundle_ctx/include/celix_bundle_context_ei.h
similarity index 100%
rename from
libs/error_injector/celix_bundle_ctx/include/celix_bundle_context_ei.h
rename to libs/framework/ei/celix_bundle_ctx/include/celix_bundle_context_ei.h
diff --git
a/libs/error_injector/celix_bundle_ctx/src/celix_bundle_context_ei.cc
b/libs/framework/ei/celix_bundle_ctx/src/celix_bundle_context_ei.cc
similarity index 100%
rename from libs/error_injector/celix_bundle_ctx/src/celix_bundle_context_ei.cc
rename to libs/framework/ei/celix_bundle_ctx/src/celix_bundle_context_ei.cc
diff --git a/libs/utils/CMakeLists.txt b/libs/utils/CMakeLists.txt
index 89b5ac0a..e422798e 100644
--- a/libs/utils/CMakeLists.txt
+++ b/libs/utils/CMakeLists.txt
@@ -111,6 +111,9 @@ if (UTILS)
#Alias setup to match external usage
add_library(Celix::utils ALIAS utils)
+ if (ENABLE_TESTING AND LINKER_WRAP_SUPPORTED)
+ add_subdirectory(ei)
+ endif ()
if (ENABLE_TESTING)
add_library(utils_cut STATIC ${UTILS_SRC})
diff --git a/libs/error_injector/celix_hash_map/CMakeLists.txt
b/libs/utils/ei/CMakeLists.txt
similarity index 68%
copy from libs/error_injector/celix_hash_map/CMakeLists.txt
copy to libs/utils/ei/CMakeLists.txt
index dbef2bb6..e055e028 100644
--- a/libs/error_injector/celix_hash_map/CMakeLists.txt
+++ b/libs/utils/ei/CMakeLists.txt
@@ -15,11 +15,11 @@
# specific language governing permissions and limitations
# under the License.
-add_library(hash_map_ei STATIC src/celix_hash_map_ei.cc)
-
-target_include_directories(hash_map_ei PUBLIC
${CMAKE_CURRENT_LIST_DIR}/include)
-target_link_libraries(hash_map_ei PUBLIC Celix::error_injector Celix::utils)
-target_link_options(hash_map_ei INTERFACE
- LINKER:--wrap,celix_stringHashMap_create
-)
-add_library(Celix::hash_map_ei ALIAS hash_map_ei)
+add_subdirectory(celix_array_list)
+add_subdirectory(celix_hash_map)
+add_subdirectory(celix_long_hash_map)
+add_subdirectory(celix_properties)
+add_subdirectory(celix_threads)
+add_subdirectory(celix_utils)
+add_subdirectory(celix_version)
+add_subdirectory(zip)
\ No newline at end of file
diff --git a/libs/error_injector/celix_array_list/CMakeLists.txt
b/libs/utils/ei/celix_array_list/CMakeLists.txt
similarity index 94%
rename from libs/error_injector/celix_array_list/CMakeLists.txt
rename to libs/utils/ei/celix_array_list/CMakeLists.txt
index 9954bf00..24fb126d 100644
--- a/libs/error_injector/celix_array_list/CMakeLists.txt
+++ b/libs/utils/ei/celix_array_list/CMakeLists.txt
@@ -17,7 +17,7 @@
add_library(array_list_ei STATIC src/celix_array_list_ei.cc)
-target_include_directories(array_list_ei PUBLIC
${CMAKE_CURRENT_LIST_DIR}/include)
+target_include_directories(array_list_ei PUBLIC include)
target_link_libraries(array_list_ei PUBLIC Celix::error_injector Celix::utils)
target_link_options(array_list_ei INTERFACE
LINKER:--wrap,celix_arrayList_create
diff --git a/libs/error_injector/celix_array_list/include/celix_array_list_ei.h
b/libs/utils/ei/celix_array_list/include/celix_array_list_ei.h
similarity index 100%
rename from libs/error_injector/celix_array_list/include/celix_array_list_ei.h
rename to libs/utils/ei/celix_array_list/include/celix_array_list_ei.h
diff --git a/libs/error_injector/celix_array_list/src/celix_array_list_ei.cc
b/libs/utils/ei/celix_array_list/src/celix_array_list_ei.cc
similarity index 100%
rename from libs/error_injector/celix_array_list/src/celix_array_list_ei.cc
rename to libs/utils/ei/celix_array_list/src/celix_array_list_ei.cc
diff --git a/libs/error_injector/celix_hash_map/CMakeLists.txt
b/libs/utils/ei/celix_hash_map/CMakeLists.txt
similarity index 92%
rename from libs/error_injector/celix_hash_map/CMakeLists.txt
rename to libs/utils/ei/celix_hash_map/CMakeLists.txt
index dbef2bb6..25f87d49 100644
--- a/libs/error_injector/celix_hash_map/CMakeLists.txt
+++ b/libs/utils/ei/celix_hash_map/CMakeLists.txt
@@ -17,7 +17,7 @@
add_library(hash_map_ei STATIC src/celix_hash_map_ei.cc)
-target_include_directories(hash_map_ei PUBLIC
${CMAKE_CURRENT_LIST_DIR}/include)
+target_include_directories(hash_map_ei PUBLIC include)
target_link_libraries(hash_map_ei PUBLIC Celix::error_injector Celix::utils)
target_link_options(hash_map_ei INTERFACE
LINKER:--wrap,celix_stringHashMap_create
diff --git a/libs/error_injector/celix_hash_map/include/celix_hash_map_ei.h
b/libs/utils/ei/celix_hash_map/include/celix_hash_map_ei.h
similarity index 100%
rename from libs/error_injector/celix_hash_map/include/celix_hash_map_ei.h
rename to libs/utils/ei/celix_hash_map/include/celix_hash_map_ei.h
diff --git a/libs/error_injector/celix_hash_map/src/celix_hash_map_ei.cc
b/libs/utils/ei/celix_hash_map/src/celix_hash_map_ei.cc
similarity index 100%
rename from libs/error_injector/celix_hash_map/src/celix_hash_map_ei.cc
rename to libs/utils/ei/celix_hash_map/src/celix_hash_map_ei.cc
diff --git a/libs/error_injector/celix_long_hash_map/CMakeLists.txt
b/libs/utils/ei/celix_long_hash_map/CMakeLists.txt
similarity index 92%
rename from libs/error_injector/celix_long_hash_map/CMakeLists.txt
rename to libs/utils/ei/celix_long_hash_map/CMakeLists.txt
index 004eb71c..ad3cb09c 100644
--- a/libs/error_injector/celix_long_hash_map/CMakeLists.txt
+++ b/libs/utils/ei/celix_long_hash_map/CMakeLists.txt
@@ -17,7 +17,7 @@
add_library(long_hash_map_ei STATIC src/celix_long_hash_map_ei.cc)
-target_include_directories(long_hash_map_ei PUBLIC
${CMAKE_CURRENT_LIST_DIR}/include)
+target_include_directories(long_hash_map_ei PUBLIC include)
target_link_libraries(long_hash_map_ei PUBLIC Celix::error_injector
Celix::utils)
target_link_options(long_hash_map_ei INTERFACE
diff --git
a/libs/error_injector/celix_long_hash_map/include/celix_long_hash_map_ei.h
b/libs/utils/ei/celix_long_hash_map/include/celix_long_hash_map_ei.h
similarity index 100%
rename from
libs/error_injector/celix_long_hash_map/include/celix_long_hash_map_ei.h
rename to libs/utils/ei/celix_long_hash_map/include/celix_long_hash_map_ei.h
diff --git
a/libs/error_injector/celix_long_hash_map/src/celix_long_hash_map_ei.cc
b/libs/utils/ei/celix_long_hash_map/src/celix_long_hash_map_ei.cc
similarity index 100%
rename from
libs/error_injector/celix_long_hash_map/src/celix_long_hash_map_ei.cc
rename to libs/utils/ei/celix_long_hash_map/src/celix_long_hash_map_ei.cc
diff --git a/libs/error_injector/celix_properties/CMakeLists.txt
b/libs/utils/ei/celix_properties/CMakeLists.txt
similarity index 93%
rename from libs/error_injector/celix_properties/CMakeLists.txt
rename to libs/utils/ei/celix_properties/CMakeLists.txt
index 3a8a7bfa..2ddcf2fd 100644
--- a/libs/error_injector/celix_properties/CMakeLists.txt
+++ b/libs/utils/ei/celix_properties/CMakeLists.txt
@@ -17,7 +17,7 @@
add_library(properties_ei STATIC src/celix_properties_ei.cc)
-target_include_directories(properties_ei PUBLIC
${CMAKE_CURRENT_LIST_DIR}/include)
+target_include_directories(properties_ei PUBLIC include)
target_link_libraries(properties_ei PUBLIC Celix::error_injector Celix::utils)
# It plays nicely with address sanitizer this way.
target_link_options(properties_ei INTERFACE
diff --git a/libs/error_injector/celix_properties/include/celix_properties_ei.h
b/libs/utils/ei/celix_properties/include/celix_properties_ei.h
similarity index 100%
rename from libs/error_injector/celix_properties/include/celix_properties_ei.h
rename to libs/utils/ei/celix_properties/include/celix_properties_ei.h
diff --git a/libs/error_injector/celix_properties/src/celix_properties_ei.cc
b/libs/utils/ei/celix_properties/src/celix_properties_ei.cc
similarity index 100%
rename from libs/error_injector/celix_properties/src/celix_properties_ei.cc
rename to libs/utils/ei/celix_properties/src/celix_properties_ei.cc
diff --git a/libs/error_injector/celix_threads/CMakeLists.txt
b/libs/utils/ei/celix_threads/CMakeLists.txt
similarity index 94%
rename from libs/error_injector/celix_threads/CMakeLists.txt
rename to libs/utils/ei/celix_threads/CMakeLists.txt
index 80327143..ed97d3a5 100644
--- a/libs/error_injector/celix_threads/CMakeLists.txt
+++ b/libs/utils/ei/celix_threads/CMakeLists.txt
@@ -17,7 +17,7 @@
add_library(threads_ei STATIC src/celix_threads_ei.cc)
-target_include_directories(threads_ei PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
+target_include_directories(threads_ei PUBLIC include)
target_link_libraries(threads_ei PUBLIC Celix::error_injector Celix::utils)
target_link_options(threads_ei INTERFACE
diff --git a/libs/error_injector/celix_threads/include/celix_threads_ei.h
b/libs/utils/ei/celix_threads/include/celix_threads_ei.h
similarity index 100%
rename from libs/error_injector/celix_threads/include/celix_threads_ei.h
rename to libs/utils/ei/celix_threads/include/celix_threads_ei.h
diff --git a/libs/error_injector/celix_threads/src/celix_threads_ei.cc
b/libs/utils/ei/celix_threads/src/celix_threads_ei.cc
similarity index 100%
rename from libs/error_injector/celix_threads/src/celix_threads_ei.cc
rename to libs/utils/ei/celix_threads/src/celix_threads_ei.cc
diff --git a/libs/error_injector/celix_utils/CMakeLists.txt
b/libs/utils/ei/celix_utils/CMakeLists.txt
similarity index 94%
rename from libs/error_injector/celix_utils/CMakeLists.txt
rename to libs/utils/ei/celix_utils/CMakeLists.txt
index f8873d5f..651dab0a 100644
--- a/libs/error_injector/celix_utils/CMakeLists.txt
+++ b/libs/utils/ei/celix_utils/CMakeLists.txt
@@ -17,7 +17,7 @@
add_library(utils_ei STATIC src/celix_utils_ei.cc)
-target_include_directories(utils_ei PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
+target_include_directories(utils_ei PUBLIC include)
target_link_libraries(utils_ei PUBLIC Celix::error_injector Celix::utils)
# It plays nicely with address sanitizer this way.
target_link_options(utils_ei INTERFACE
diff --git a/libs/error_injector/celix_utils/include/celix_utils_ei.h
b/libs/utils/ei/celix_utils/include/celix_utils_ei.h
similarity index 100%
rename from libs/error_injector/celix_utils/include/celix_utils_ei.h
rename to libs/utils/ei/celix_utils/include/celix_utils_ei.h
diff --git a/libs/error_injector/celix_utils/src/celix_utils_ei.cc
b/libs/utils/ei/celix_utils/src/celix_utils_ei.cc
similarity index 100%
rename from libs/error_injector/celix_utils/src/celix_utils_ei.cc
rename to libs/utils/ei/celix_utils/src/celix_utils_ei.cc
diff --git a/libs/error_injector/celix_version/CMakeLists.txt
b/libs/utils/ei/celix_version/CMakeLists.txt
similarity index 93%
rename from libs/error_injector/celix_version/CMakeLists.txt
rename to libs/utils/ei/celix_version/CMakeLists.txt
index 45abfb40..a89f7d9d 100644
--- a/libs/error_injector/celix_version/CMakeLists.txt
+++ b/libs/utils/ei/celix_version/CMakeLists.txt
@@ -17,7 +17,7 @@
add_library(version_ei STATIC src/celix_version_ei.cc)
-target_include_directories(version_ei PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
+target_include_directories(version_ei PUBLIC include)
target_link_libraries(version_ei PUBLIC Celix::error_injector Celix::utils)
# It plays nicely with address sanitizer this way.
target_link_options(version_ei INTERFACE
diff --git a/libs/error_injector/celix_version/include/celix_version_ei.h
b/libs/utils/ei/celix_version/include/celix_version_ei.h
similarity index 100%
rename from libs/error_injector/celix_version/include/celix_version_ei.h
rename to libs/utils/ei/celix_version/include/celix_version_ei.h
diff --git a/libs/error_injector/celix_version/src/celix_version_ei.cc
b/libs/utils/ei/celix_version/src/celix_version_ei.cc
similarity index 100%
rename from libs/error_injector/celix_version/src/celix_version_ei.cc
rename to libs/utils/ei/celix_version/src/celix_version_ei.cc
diff --git a/libs/error_injector/zip/CMakeLists.txt
b/libs/utils/ei/zip/CMakeLists.txt
similarity index 93%
rename from libs/error_injector/zip/CMakeLists.txt
rename to libs/utils/ei/zip/CMakeLists.txt
index 9646397f..85873756 100644
--- a/libs/error_injector/zip/CMakeLists.txt
+++ b/libs/utils/ei/zip/CMakeLists.txt
@@ -18,7 +18,7 @@
find_package(libzip REQUIRED)
add_library(zip_ei STATIC src/zip_ei.cc)
-target_include_directories(zip_ei PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
+target_include_directories(zip_ei PUBLIC include)
target_link_libraries(zip_ei PUBLIC Celix::error_injector libzip::libzip)
# It plays nicely with address sanitizer this way.
diff --git a/libs/error_injector/zip/include/zip_ei.h
b/libs/utils/ei/zip/include/zip_ei.h
similarity index 100%
rename from libs/error_injector/zip/include/zip_ei.h
rename to libs/utils/ei/zip/include/zip_ei.h
diff --git a/libs/error_injector/zip/src/zip_ei.cc
b/libs/utils/ei/zip/src/zip_ei.cc
similarity index 100%
rename from libs/error_injector/zip/src/zip_ei.cc
rename to libs/utils/ei/zip/src/zip_ei.cc
