From e629bbbe2bea3651089c6b026a34ee04e9ec1464 Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz <jakob@collabora.com> Date: Sat, 22 Oct 2022 16:33:00 +0100 Subject: [PATCH] a/util: Split out process functions into own library --- src/xrt/auxiliary/util/CMakeLists.txt | 19 ++++++++++++------- src/xrt/ipc/CMakeLists.txt | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/xrt/auxiliary/util/CMakeLists.txt b/src/xrt/auxiliary/util/CMakeLists.txt index d96fa6f0c..ab0691433 100644 --- a/src/xrt/auxiliary/util/CMakeLists.txt +++ b/src/xrt/auxiliary/util/CMakeLists.txt @@ -86,8 +86,6 @@ add_library( u_config_json.c u_config_json.h u_verify.h - u_process.c - u_process.h u_win32_com_guard.cpp u_win32_com_guard.hpp u_worker.c @@ -109,11 +107,6 @@ if(XRT_FEATURE_TRACING AND XRT_HAVE_PERCETTO) target_link_libraries(aux_util PUBLIC percetto::percetto) endif() -if(XRT_HAVE_LIBBSD) - target_include_directories(aux_util SYSTEM PRIVATE ${LIBBSD_INCLUDE_DIRS}) - target_link_libraries(aux_util PUBLIC ${LIBBSD_LIBRARIES}) -endif() - if(ANDROID) target_link_libraries(aux_util PUBLIC ${ANDROID_LOG_LIBRARY}) endif() @@ -151,3 +144,15 @@ if(XRT_HAVE_JPEG) target_link_libraries(aux_util_sink PRIVATE ${JPEG_LIBRARIES}) target_include_directories(aux_util_sink PRIVATE ${JPEG_INCLUDE_DIRS}) endif() + +#### +# Process library +# + +add_library(aux_util_process STATIC u_process.c u_process.h) +target_link_libraries(aux_util_process PUBLIC aux-includes aux_util) + +if(XRT_HAVE_LIBBSD) + target_include_directories(aux_util_process SYSTEM PRIVATE ${LIBBSD_INCLUDE_DIRS}) + target_link_libraries(aux_util_process PUBLIC ${LIBBSD_LIBRARIES}) +endif() diff --git a/src/xrt/ipc/CMakeLists.txt b/src/xrt/ipc/CMakeLists.txt index 01ff698c9..b90f24fae 100644 --- a/src/xrt/ipc/CMakeLists.txt +++ b/src/xrt/ipc/CMakeLists.txt @@ -92,7 +92,7 @@ target_include_directories( PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ) -target_link_libraries(ipc_server PRIVATE aux_util ipc_shared) +target_link_libraries(ipc_server PRIVATE aux_util aux_util_process ipc_shared) if(XRT_HAVE_SYSTEMD) target_include_directories(ipc_server PRIVATE ${SYSTEMD_INCLUDE_DIRS})