From 0cb2236be043ac620104fe4f0a1ec1b7f2d289ba Mon Sep 17 00:00:00 2001 From: yangwei Date: Mon, 14 Sep 2020 16:45:54 +0800 Subject: [PATCH] =?UTF-8?q?cmake=20IMPORT=E5=8A=A8=E6=80=81=E5=BA=93?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E6=9C=AA=E8=A7=A3=E5=86=B3=EF=BC=8C=E6=94=B9?= =?UTF-8?q?=E5=9B=9E=E4=BD=BF=E7=94=A8=E9=9D=99=E6=80=81=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?zlog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMakeLists.txt | 4 ++-- zlog/CMakeLists.txt | 13 +++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b59a437..b1f17b6 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_shared) +target_link_libraries(${lib_name}_shared zlog_static) 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 zlog_shared) +target_link_libraries(${lib_name}_static zlog_static) 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 0458cc6..7020b27 100644 --- a/zlog/CMakeLists.txt +++ b/zlog/CMakeLists.txt @@ -14,10 +14,15 @@ 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) +add_dependencies(zlog_shared zlog) +set_property(TARGET zlog_shared PROPERTY IMPORTED_LOCATION ${SOURCE_DIR}/src/libzlog.so.1.2) +set_property(TARGET zlog_shared PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${SOURCE_DIR}/src) install(FILES ${SOURCE_DIR}/src/libzlog.so.1.2 DESTINATION lib COMPONENT LIBRARIES) -install(PROGRAMS ${SOURCE_DIR}/src/zlog-chk-conf DESTINATION bin COMPONENT EXECUTABLE) +install(FILES ${SOURCE_DIR}/src/zlog-chk-conf DESTINATION bin COMPONENT EXECUTABLE) \ No newline at end of file