diff options
| author | yangwei <[email protected]> | 2020-09-14 16:45:54 +0800 |
|---|---|---|
| committer | yangwei <[email protected]> | 2020-09-14 16:45:54 +0800 |
| commit | 0cb2236be043ac620104fe4f0a1ec1b7f2d289ba (patch) | |
| tree | 73f74874bfe8e8cb774b3a8e98269fb6e1256e25 | |
| parent | 332201d4b0ef3a0b766ebb06b3dc35c2e6a92f3f (diff) | |
cmake IMPORT动态库安装未解决，改回使用静态连接zlog
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | 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 |