修复rpm打包失败的问题

CMakeLists.txt

@@ -10,7 +10,6 @@ set(LIB_MINOR_VERSION 1)
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 include(Version)
 
-#SET(CMAKE_C_COMPILER "/usr/bin/g++")
 set(CMAKE_MACOSX_RPATH 0)
 set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -Wall)
 set(CMAKE_INSTALL_PREFIX /opt/MESA)
@@ -35,41 +34,31 @@ endif()
 
 include_directories(${PROJECT_SOURCE_DIR}/inc/)
 
-file(GLOB SRC
-    "src/*.c"
-    "src/*.cpp"
-)
-
 
 # Shared Library Output
-add_library(${lib_name}_shared SHARED ${SRC})
+add_library(${lib_name}_shared SHARED src/MESA_handle_logger.c)
 if(DEFINED MESA_SHARED_INSTALL_DIR)
 	set_target_properties(${lib_name}_shared PROPERTIES OUTPUT_NAME ${lib_name} LIBRARY_OUTPUT_DIRECTORY ${MESA_SHARED_INSTALL_DIR})
 else()
 	set_target_properties(${lib_name}_shared PROPERTIES OUTPUT_NAME ${lib_name})
 endif()
 
-set_target_properties(${lib_name}_shared PROPERTIES VERSION ${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION})
-set_target_properties(${lib_name}_shared PROPERTIES SOVERSION ${LIB_MAJOR_VERSION})
+#set_target_properties(${lib_name}_shared PROPERTIES VERSION ${LIB_MAJOR_VERSION}.${LIB_MINOR_VERSION})
+#set_target_properties(${lib_name}_shared PROPERTIES SOVERSION ${LIB_MAJOR_VERSION})
 
 
 # static Library Output
-add_library(${lib_name}_static STATIC ${SRC})
+add_library(${lib_name}_static STATIC src/MESA_handle_logger.c)
 set_target_properties(${lib_name}_static PROPERTIES OUTPUT_NAME ${lib_name})
 
 set(CMAKE_INSTALL_PREFIX /opt/MESA)
 
-install(TARGETS ${lib_name}_shared  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARY)
+install(TARGETS ${lib_name}_shared  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib COMPONENT LIBRARIES)
 install(FILES inc/${lib_name}.h   DESTINATION ${CMAKE_INSTALL_PREFIX}/include/MESA COMPONENT HEADER)
 
 
 
-file(GLOB DEMO
-    "demo/*.c"
-    "demo/*.cpp"
-)
-
-add_executable(${lib_name}_demo ${DEMO})
+add_executable(${lib_name}_demo demo/test_handle_logger.c)
 target_link_libraries(${lib_name}_demo  rt pthread ${lib_name}_static)
 
 include(Package)

README

@@ -4,13 +4,16 @@
  *Author:yangwei@iie.ac.cn
  *History:
 		2014-03-24 created by yw
-		1)first version
+		1)第一个动态库版本
 		
 		2014-04-16 modified by yw
-		1)strict inspection parameters, compatible with g++ 4.4.4
+		1) 支持g++ 4.4.4编译
 		
 		2014-05-29 update by yw
-		1)create  directory is supported
+		1)支持创建用户指定的日志目录
+
+		2019-2-18 update by yw
+		1)性能优化，句柄中存储文件fp，定期flush至文件
 ------------------------------------------------------------------------------------- 		
  NOTICE:
 		1)compatible with g++, extern with c;

cmake/Package.cmake

@@ -26,23 +26,23 @@ set(CPACK_RPM_COMPONENT_INSTALL ON)
 set(CPACK_COMPONENTS_IGNORE_GROUPS 1)
 set(CPACK_COMPONENTS_GROUPING ONE_PER_GROUP)
 set(CPACK_COMPONENT_HEADER_DISPLAY_NAME "develop")
-set(CPACK_COMPONENT_LIBRARY_REQUIRED TRUE)
+set(CPACK_COMPONENT_LIBRARIES_REQUIRED TRUE)
 set(CPACK_COMPONENT_HEADER_REQUIRED TRUE)
 set(CPACK_RPM_HEADER_PACKAGE_NAME "${MY_RPM_NAME_PREFIX}-devel")
-set(CPACK_RPM_LIBRARY_PACKAGE_NAME ${MY_RPM_NAME_PREFIX})
+set(CPACK_RPM_LIBRARIES_PACKAGE_NAME ${MY_RPM_NAME_PREFIX})
 
-set(CPACK_RPM_FILE_NAME "${CPACK_RPM_LIBRARY_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
-set(CPACK_RPM_LIBRARY_DEBUGINFO_FILE_NAME "${CPACK_RPM_LIBRARY_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
-set(CPACK_COMPONENT_LIBRARY_GROUP "library")
+set(CPACK_RPM_FILE_NAME "${CPACK_RPM_LIBRARIES_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+set(CPACK_RPM_LIBRARIES_DEBUGINFO_FILE_NAME "${CPACK_RPM_LIBRARIES_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
+set(CPACK_COMPONENT_LIBRARIES_GROUP "libraries")
 
 set(CPACK_RPM_HEADER_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
 set(CPACK_RPM_HEADER_DEBUGINFO_FILE_NAME "${CPACK_RPM_HEADER_PACKAGE_NAME}-debuginfo-${CPACK_PACKAGE_VERSION}-${SYSTEM_VERSION}.rpm")
 set(CPACK_COMPONENT_HEADER_GROUP "header")
 
-set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARY_PACKAGE_NAME})
+set(CPACK_RPM_HEADER_PACKAGE_REQUIRES_PRE ${CPACK_RPM_LIBRARIES_PACKAGE_NAME})
 set(CPACK_RPM_HEADER_PACKAGE_CONFLICTS ${CPACK_RPM_HEADER_PACKAGE_NAME})
 
-set(CPACK_COMPONENTS_ALL LIBRARY HEADER)
+set(CPACK_COMPONENTS_ALL LIBRARIES HEADER)
 
 
 set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}")