移除无关文件

1.移除.so和.a文件
2.移除test文件

5 files changed, 9 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index 1dbe669..0433f2f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ build/
 .idea
 core.*
 version.txt
+demo/test_handle_logger
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6142992..2a96711 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,6 @@ project (${lib_name})
 
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 include(Version)
-include(Package)
 
 set(CMAKE_MACOSX_RPATH 0)
 
@@ -46,8 +45,9 @@ add_library(${lib_name}_static STATIC ${SRC})
 set_target_properties(${lib_name}_static PROPERTIES OUTPUT_NAME ${lib_name})
 
 set(CMAKE_INSTALL_PREFIX /opt/MESA)
-install(TARGETS ${lib_name}_shared DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
-install(FILES inc/MESA_handle_logger.h DESTINATION
+
+install(TARGETS ${lib_name}_shared  LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+install(FILES inc/${lib_name}.h   DESTINATION
     ${CMAKE_INSTALL_PREFIX}/include/MESA)
 
 
@@ -59,3 +59,5 @@ file(GLOB DEMO
 
 add_executable(demo ${DEMO})
 target_link_libraries(demo  pthread ${lib_name}_static)
+
+include(Package)
diff --git a/cmake/Package.cmake b/cmake/Package.cmake
index 7c96e02..12a55a5 100644
--- a/cmake/Package.cmake
+++ b/cmake/Package.cmake
@@ -21,12 +21,14 @@ set(CPACK_RPM_PACKAGE_AUTOREQPROV "no")
 set(CPACK_RPM_PACKAGE_RELEASE_DIST on)
 set(CPACK_RPM_DEBUGINFO_PACKAGE on)
 
+set(CPACK_BUILD_SOURCE_DIRS "${CMAKE_SOURCE_DIR}")
+
 # Must uninstall the debug package before install release package
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     set(CPACK_RPM_PACKAGE_CONFLICTS "${lib_name}-debug")
 else()
     set(CPACK_RPM_PACKAGE_CONFLICTS ${lib_name})
-    set(CPACK_STRIP_FILES TRUE)
+    #    set(CPACK_STRIP_FILES TRUE)
 endif()
 
 include(CPack)
diff --git a/lib/libMESA_handle_logger.a b/lib/libMESA_handle_logger.a
deleted file mode 100644
index 1482eaf..0000000
--- a/lib/libMESA_handle_logger.a
+++ /dev/null
diff --git a/lib/libMESA_handle_logger.so b/lib/libMESA_handle_logger.so
deleted file mode 100644
index 1178d9a..0000000
--- a/lib/libMESA_handle_logger.so
+++ /dev/null