From 387fe1dbfffdc3d73cf46f2c054f4d25543c8523 Mon Sep 17 00:00:00 2001
From: Fu Juntang <StrongTiger_001@163.com>
Date: 星期三, 01 九月 2021 10:55:35 +0800
Subject: [PATCH] Fix the building issue when protobuf is enabled.
---
test_net_socket/CMakeLists.txt | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/test_net_socket/CMakeLists.txt b/test_net_socket/CMakeLists.txt
index 574fcaf..748642c 100644
--- a/test_net_socket/CMakeLists.txt
+++ b/test_net_socket/CMakeLists.txt
@@ -1,23 +1,22 @@
# add command
add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/net_mod_socket.sh
- COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/net_mod_socket.sh ${CMAKE_CURRENT_BINARY_DIR}/net_mod_socket.sh
+ OUTPUT ${PROJECT_BINARY_DIR}/bin/net_mod_socket.sh
+ COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/net_mod_socket.sh ${PROJECT_BINARY_DIR}/bin/net_mod_socket.sh
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/net_mod_socket.sh
+ VERBATIM
)
-add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/heart_beat.sh
- COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/heart_beat.sh ${CMAKE_CURRENT_BINARY_DIR}/heart_beat.sh
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/heart_beat.sh
- )
+add_custom_target("net_mod_socket.sh" ALL DEPENDS ${PROJECT_BINARY_DIR}/bin/net_mod_socket.sh)
+
# add the executable
-add_executable(test_net_mod_socket test_net_mod_socket.cpp ${CMAKE_CURRENT_BINARY_DIR}/net_mod_socket.sh)
-target_link_libraries(test_net_mod_socket PRIVATE shm_queue ${EXTRA_LIBS} )
+add_executable(shm_util shm_util.cpp )
+target_link_libraries(shm_util PRIVATE shm_queue ${EXTRA_LIBS} )
+target_include_directories(shm_util PRIVATE
+ "${PROJECT_BINARY_DIR}"
+ ${EXTRA_INCLUDES}
+ )
-
-add_executable(heart_beat heart_beat.cpp ${CMAKE_CURRENT_BINARY_DIR}/heart_beat.sh)
-target_link_libraries(heart_beat PRIVATE shm_queue ${EXTRA_LIBS} )
add_executable(test_bus_stop test_bus_stop.cpp)
@@ -34,10 +33,5 @@
-target_include_directories(test_net_mod_socket PRIVATE
- "${PROJECT_BINARY_DIR}"
- ${EXTRA_INCLUDES}
- )
-
# add the install targets
-install(TARGETS test_net_mod_socket DESTINATION bin)
+install(TARGETS shm_util DESTINATION bin)
--
Gitblit v1.8.0