From e15d6fe15898caab7180b2065fea3382ecabd3e0 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期五, 05 二月 2021 19:01:23 +0800
Subject: [PATCH] update
---
src/socket/shm_mod_socket.h | 4 ++--
src/CMakeLists.txt | 9 ++++++---
CMakeLists.txt | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8fd5807..8cbc168 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@
# we don't need to tinker with the path to run the executable
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
-# set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/bin")
option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fe74091..506e5ed 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,10 +28,13 @@
./shm/hashtable.cpp
)
+if (BUILD_SHARED_LIBS)
+ add_library(shm_queue SHARED ${_SOURCES_})
+else()
+ add_library(shm_queue STATIC ${_SOURCES_})
+endif()
-# add_library(shm_queue SHARED ${_SOURCES_})
-# add_library(shm_queue STATIC ${_SOURCES_})
-add_library(shm_queue ${_SOURCES_})
+#add_library(shm_queue ${_SOURCES_})
target_include_directories(shm_queue PUBLIC ${EXTRA_INCLUDES} )
diff --git a/src/socket/shm_mod_socket.h b/src/socket/shm_mod_socket.h
index 3795cfb..dc1f210 100644
--- a/src/socket/shm_mod_socket.h
+++ b/src/socket/shm_mod_socket.h
@@ -36,8 +36,8 @@
static int get_bus_sendbuf(bus_head_t &request_head, const void *topic_buf, int topic_size, const void *content_buf, int content_size, void **retbuf);
public:
- static size_t remove_keys(int keys[], size_t length);
- static size_t remove_keys_exclude(int keys[], size_t length);
+ // static size_t remove_keys(int keys[], size_t length);
+ // static size_t remove_keys_exclude(int keys[], size_t length);
// bus header 缂栫爜涓虹綉缁滀紶杈撶殑瀛楄妭
static void * encode_bus_head(bus_head_t & bushead);
--
Gitblit v1.8.0