a/util: Split out process functions into own library

This commit is contained in:
Jakob Bornecrantz 2022-10-22 16:33:00 +01:00 committed by Ryan Pavlik
parent 8ca60f4304
commit e629bbbe2b
2 changed files with 13 additions and 8 deletions
src/xrt

View file

@ -86,8 +86,6 @@ add_library(
u_config_json.c u_config_json.c
u_config_json.h u_config_json.h
u_verify.h u_verify.h
u_process.c
u_process.h
u_win32_com_guard.cpp u_win32_com_guard.cpp
u_win32_com_guard.hpp u_win32_com_guard.hpp
u_worker.c u_worker.c
@ -109,11 +107,6 @@ if(XRT_FEATURE_TRACING AND XRT_HAVE_PERCETTO)
target_link_libraries(aux_util PUBLIC percetto::percetto) target_link_libraries(aux_util PUBLIC percetto::percetto)
endif() 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) if(ANDROID)
target_link_libraries(aux_util PUBLIC ${ANDROID_LOG_LIBRARY}) target_link_libraries(aux_util PUBLIC ${ANDROID_LOG_LIBRARY})
endif() endif()
@ -151,3 +144,15 @@ if(XRT_HAVE_JPEG)
target_link_libraries(aux_util_sink PRIVATE ${JPEG_LIBRARIES}) target_link_libraries(aux_util_sink PRIVATE ${JPEG_LIBRARIES})
target_include_directories(aux_util_sink PRIVATE ${JPEG_INCLUDE_DIRS}) target_include_directories(aux_util_sink PRIVATE ${JPEG_INCLUDE_DIRS})
endif() 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()

View file

@ -92,7 +92,7 @@ target_include_directories(
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
PRIVATE ${CMAKE_CURRENT_BINARY_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) if(XRT_HAVE_SYSTEMD)
target_include_directories(ipc_server PRIVATE ${SYSTEMD_INCLUDE_DIRS}) target_include_directories(ipc_server PRIVATE ${SYSTEMD_INCLUDE_DIRS})