From 75fd317cafc70bb646148af8a70605af692db134 Mon Sep 17 00:00:00 2001
From: shenxin <shenxin@xxx.com>
Date: 星期二, 31 八月 2021 13:46:41 +0800
Subject: [PATCH] 整理
---
CMakeLists.txt | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef9b64a..049e0b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,16 +9,19 @@
# control where the static and shared libraries are built so that on windows
# we don't need to tinker with the path to run the executable
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
-# set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
+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}/bin")
option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
+
+add_compile_options(-fPIC)
+
option(BUILD_DOC "Build doc" OFF)
-list(APPEND EXTRA_INCLUDES "${PROJECT_SOURCE_DIR}/include/usgcommon")
-list(APPEND EXTRA_LIBS ${PROJECT_SOURCE_DIR}/lib/libusgcommon.a pthread rt)
+list(APPEND EXTRA_INCLUDES "${PROJECT_SOURCE_DIR}/include/usgcommon")
+list(APPEND EXTRA_LIBS ${PROJECT_SOURCE_DIR}/lib/libusgcommon.a pthread rt protobuf-lite.a)
# build api doc
if (BUILD_DOC)
@@ -28,4 +31,10 @@
add_subdirectory(${PROJECT_SOURCE_DIR}/src)
add_subdirectory(${PROJECT_SOURCE_DIR}/test)
add_subdirectory(${PROJECT_SOURCE_DIR}/test_net_socket)
+ add_subdirectory(${PROJECT_SOURCE_DIR}/test_socket)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR}/proto)
+ #add_subdirectory(${PROJECT_SOURCE_DIR}/shm_util)
endif()
+
+add_definitions("-DPROTOBUF_USS_DLLS")
+
--
Gitblit v1.8.0