From 30f209462728772f9ae219b023edcf8b711c1f66 Mon Sep 17 00:00:00 2001 From: guo_peixu Date: Mon, 13 Jun 2022 14:39:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9MESA=5Flog=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=BA=93=E9=93=BE=E6=8E=A5=E5=8F=AF=E6=89=A7=E8=A1=8C=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98=E3=80=82cmake?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=AD=E9=9A=90=E8=97=8F=E4=BA=86=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E5=BA=93=E4=B8=AD=E7=9A=84=E5=87=BD=E6=95=B0=E7=AC=A6?= =?UTF-8?q?=E5=8F=B7=E5=AF=BC=E8=87=B4=E9=93=BE=E6=8E=A5=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=BF=99=E4=BA=9B=E5=AF=B9=E5=A4=96?= =?UTF-8?q?=E6=8F=90=E4=BE=9B=E7=9A=84=E5=87=BD=E6=95=B0=E7=AC=A6=E5=8F=B7?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 4 ++-- shm_consumer/Makefile | 5 ++--- src/version.map | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c79099a..f051d25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,10 +73,10 @@ install(FILES conf/MESA_handle_logger.conf DESTINATION /usr/lib/tmpfiles.d/ COMP add_executable(${lib_name}_demo demo/test_handle_logger.c) -target_link_libraries(${lib_name}_demo pthread ${lib_name}_static) +target_link_libraries(${lib_name}_demo pthread ${lib_name}_shared) add_executable(${lib_name}_consumer shm_consumer/MESA_shm_consumer.c) -target_link_libraries(${lib_name}_consumer ${lib_name}_static) +target_link_libraries(${lib_name}_consumer ${lib_name}_shared) include(Package) diff --git a/shm_consumer/Makefile b/shm_consumer/Makefile index 1940ba2..05b030f 100644 --- a/shm_consumer/Makefile +++ b/shm_consumer/Makefile @@ -6,9 +6,8 @@ CC=gcc CFLAGS= -g3 -Wall -fPIC -O -Werror CFLAGS+=-I../inc/ -#LIB=-L../lib/ -LIB=../lib/libMESA_handle_logger.a ../lib/libMESA_snprintf.a -LIB+=-lpthread + +LIB=../lib/libMESA_handle_logger.a LIB_FILE=$(wildcard ../lib/*.a) diff --git a/src/version.map b/src/version.map index 4b6c2e8..80ddb27 100644 --- a/src/version.map +++ b/src/version.map @@ -1,4 +1,4 @@ { - global: MESA*runtime_log*;GIT_VERSION_*; + global: MESA*runtime_log*;GIT_VERSION_*;MESA_shm_alloc_overview;MESA_shm_write_ring_queue_to_file;MESA_handle_fmt_rule_register; local: *; };