From 8bfe9f711612efde96a0d7b7aa3ba7178ab51640 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期六, 20 二月 2021 15:10:11 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
CMakeLists.txt | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00acf78..5d9be24 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.5)
# set the project name and version
-project(B_BUS VERSION 3.0)
+project(B_BUS VERSION 2.2)
# specify the C++ standard
set(CMAKE_CXX_STANDARD 11)
@@ -9,16 +9,26 @@
# 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)
+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)
+list(APPEND EXTRA_LIBS ${PROJECT_SOURCE_DIR}/lib/libusgcommon.a pthread rt)
-add_subdirectory(${PROJECT_SOURCE_DIR}/src)
-add_subdirectory(${PROJECT_SOURCE_DIR}/test)
-add_subdirectory(${PROJECT_SOURCE_DIR}/test_net_socket)
\ No newline at end of file
+# build api doc
+if (BUILD_DOC)
+ # build the docs
+ add_subdirectory(${PROJECT_SOURCE_DIR}/doc)
+else()
+ 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)
+ add_subdirectory(${PROJECT_SOURCE_DIR}/shm_util)
+endif()
--
Gitblit v1.8.0