From 2a8bdb3fa77c1212560c4d6c76139da8de70c8bf Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期六, 20 二月 2021 15:09:11 +0800
Subject: [PATCH] update

---
 src/CMakeLists.txt |   86 ++++++++++++++++++++++---------------------
 1 files changed, 44 insertions(+), 42 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8343eb2..fcaf0c6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,3 @@
-
-
 # should we use our own math functions
 option(SUPPORT_RDMA "If support rdma" OFF)
 
@@ -7,18 +5,17 @@
 # to the source code
 configure_file(bus_config.h.in bus_config.h)
 
-add_library(shm_queue 
- ./logger_factory.cpp
+
+list(APPEND _SOURCES_ 
+./logger_factory.cpp
 ./socket/bus_server_socket.cpp
 ./socket/bus_server_socket_wrapper.cpp
-./socket/shm_stream_mod_socket.cpp
 ./socket/shm_socket.cpp
 ./socket/shm_mod_socket.cpp
 ./time_util.cpp
-./psem.cpp
-./svsem_util.cpp
 ./bus_error.cpp
 ./futex_sem.cpp
+./svsem.cpp
 ./net/net_conn_pool.cpp
 ./net/net_mod_server_socket_wrapper.cpp
 ./net/net_mod_socket_wrapper.cpp
@@ -28,13 +25,18 @@
 ./shm/shm_mm_wrapper.cpp
 ./shm/mm.cpp
 ./shm/hashtable.cpp
+)
 
+if (BUILD_SHARED_LIBS)
+  add_library(shm_queue SHARED ${_SOURCES_})
+else()
+ add_library(shm_queue SHARED ${_SOURCES_})
+endif()
 
-	)
+# STATIC
+# add_library(shm_queue ${_SOURCES_})
 
-target_include_directories(shm_queue PUBLIC
-                           ${EXTRA_INCLUDES}
-                           )
+target_include_directories(shm_queue PUBLIC ${EXTRA_INCLUDES} )
 
 target_include_directories(shm_queue PUBLIC
 													 ${PROJECT_BINARY_DIR}/src
@@ -49,38 +51,38 @@
 target_link_libraries(shm_queue PUBLIC  ${EXTRA_LIBS} )
 
 # install rules
-install(TARGETS shm_queue DESTINATION lib)
+install(TARGETS shm_queue  DESTINATION lib)
 install(FILES 
- ./socket/socket_def.h
-./socket/bus_server_socket.h
-./socket/shm_socket.h
-./socket/shm_stream_mod_socket.h
-./socket/shm_mod_socket.h
-./socket/bus_server_socket_wrapper.h
-./psem.h
-./key_def.h
-./time_util.h
-./futex_sem.h
-./bus_error.h
-./svsem_util.h
-./logger_factory.h
-./queue/linked_lock_free_queue.h
-./queue/array_lock_free_queue2.h
-./queue/array_lock_free_queue.h
-./queue/shm_queue.h
-./queue/lock_free_queue.h
-./net/net_conn_pool.h
-./net/net_mod_socket.h
-./net/net_mod_server_socket_wrapper.h
-./net/net_mod_socket_io.h
-./net/net_mod_server_socket.h
-./net/net_mod_socket_wrapper.h
-./shm/hashtable.h
-./shm/mem_pool.h
-./shm/mm.h
-./shm/shm_mm_wrapper.h
-./shm/shm_allocator.h
-
+  ./socket/socket_def.h
+  ./socket/bus_server_socket.h
+  ./socket/shm_socket.h
+  ./socket/shm_mod_socket.h
+  ./socket/bus_server_socket_wrapper.h
+  ./psem.h
+  ./key_def.h
+  ./time_util.h
+  ./futex_sem.h
+  ./bus_error.h
+  ./bus_def.h
+  ./sole.h
+  ./logger_factory.h
+  ./queue/linked_lock_free_queue.h
+  ./queue/array_lock_free_queue.h
+  ./queue/shm_queue.h
+  ./queue/array_lock_free_sem_queue.h
+  ./queue/lock_free_queue.h
+  ./svsem.h
+  ./net/net_conn_pool.h
+  ./net/net_mod_socket.h
+  ./net/net_mod_server_socket_wrapper.h
+  ./net/net_mod_socket_io.h
+  ./net/net_mod_server_socket.h
+  ./net/net_mod_socket_wrapper.h
+  ./shm/hashtable.h
+  ./shm/mem_pool.h
+  ./shm/mm.h
+  ./shm/shm_mm_wrapper.h
+  ./shm/shm_allocator.h
 
   DESTINATION include)
 

--
Gitblit v1.8.0