ci中tyum makecache增加fast参数

.gitlab-ci.yml

@@ -14,7 +14,7 @@ stages:
   - cd $BUILD_PADDING_PREFIX/$CI_PROJECT_PATH
   - chmod +x ./ci/travis.sh
   script:
-  - yum makecache
+  - yum makecache fast
   - ./ci/travis.sh
   - cd build
   tags:

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)

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)
+add_dependencies(zlog_shared  zlog)
-set_property(TARGET zlog_shared PROPERTY IMPORTED_LOCATION ${SOURCE_DIR}/src/libzlog.so)
+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)
+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)