From 543e82effca8836d0730ed69fcf46fbc09b6e512 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期四, 14 一月 2021 15:17:25 +0800
Subject: [PATCH] Merge branch 'dev'
---
src/CMakeLists.txt | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3b38e92..e0913e7 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,7 +5,7 @@
# configure a header file to pass some of the CMake settings
# to the source code
-configure_file(BusConfig.h.in BusConfig.h)
+configure_file(bus_config.h.in bus_config.h)
add_library(shm_queue
logger_factory.cpp
@@ -21,7 +21,6 @@
socket/net_mod_socket_io.cpp
socket/net_mod_server_socket.cpp
bus_error.cpp
- queue/shm_queue_wrapper.cpp
shm/shm_mm_wrapper.cpp
shm/mm.cpp
shm/hashtable.cpp
@@ -34,7 +33,7 @@
)
target_include_directories(shm_queue PUBLIC
- ${PROJECT_BINARY_DIR}
+ ${PROJECT_BINARY_DIR}/src
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/shm
${CMAKE_CURRENT_SOURCE_DIR}/queue
--
Gitblit v1.8.0