From f15a1fd61717c8547249c0d512ff8976a5ad4cfc Mon Sep 17 00:00:00 2001 From: yangwei Date: Thu, 10 Sep 2020 15:38:49 +0800 Subject: [PATCH] =?UTF-8?q?zlog=E4=BD=BF=E7=94=A8=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 4 ++-- zlog/CMakeLists.txt | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 03ce26c..689a8fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ add_subdirectory(zlog) # Shared Library Output add_library(${lib_name}_shared SHARED src/MESA_handle_logger.c) -target_link_libraries(${lib_name}_shared zlog-static) +target_link_libraries(${lib_name}_shared zlog_shared) set_target_properties(${lib_name}_shared PROPERTIES LINK_FLAGS "-Wl,--version-script=${PROJECT_SOURCE_DIR}/src/version.map") @@ -52,7 +52,7 @@ set_target_properties(${lib_name}_shared PROPERTIES SOVERSION ${LIB_MAJOR_VERSIO # static Library Output add_library(${lib_name}_static STATIC src/MESA_handle_logger.c) -target_link_libraries(${lib_name}_static -Wl,--whole-archive zlog-static -Wl,--no-whole-archive) +target_link_libraries(${lib_name}_static zlog_shared) set_target_properties(${lib_name}_static PROPERTIES OUTPUT_NAME ${lib_name}) set(CMAKE_INSTALL_PREFIX /opt/MESA) diff --git a/zlog/CMakeLists.txt b/zlog/CMakeLists.txt index b36779f..574e936 100644 --- a/zlog/CMakeLists.txt +++ b/zlog/CMakeLists.txt @@ -14,10 +14,11 @@ ExternalProject_Get_Property(zlog SOURCE_DIR) file(MAKE_DIRECTORY ${SOURCE_DIR}/src/) -add_library(zlog-static STATIC IMPORTED GLOBAL) -add_dependencies(zlog-static zlog) -set_property(TARGET zlog-static PROPERTY IMPORTED_LOCATION ${SOURCE_DIR}/src/libzlog.a) -set_property(TARGET zlog-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${SOURCE_DIR}/src) +add_library(zlog_shared SHARED IMPORTED GLOBAL) +add_dependencies(zlog_shared zlog) +set_property(TARGET zlog_shared PROPERTY IMPORTED_LOCATION ${SOURCE_DIR}/src/libzlog.so) +set_property(TARGET zlog_shared PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${SOURCE_DIR}/src) install(PROGRAMS ${SOURCE_DIR}/src/zlog-chk-conf DESTINATION bin COMPONENT EXECUTABLE) +install(PROGRAMS ${SOURCE_DIR}/src/libzlog.so DESTINATION lib COMPONENT LIBRARIES)