From 62ccddbe4abfea9883737d79772d4e8d1084f6b5 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期三, 03 二月 2021 17:12:51 +0800
Subject: [PATCH] update

---
 CMakeLists.txt |   52 ++++++++++++++++++++++------------------------------
 1 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4a8bee..8f59922 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,41 +1,33 @@
 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)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 
+# 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}/lib")
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/lib")
+# set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
+
+#option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
+
+option(BUILD_DOC "Build doc" OFF)
 
 
-# add the MathFunctions library
-# if(USE_MYMATH)
-#  add_subdirectory(MathFunctions)
-#  list(APPEND EXTRA_LIBS MathFunctions)
-# endif()
+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 lib/usgcommon)
-
-add_subdirectory(${PROJECT_SOURCE_DIR}/src)
-# list(APPEND EXTRA_LIBS shm_queue)
-
-
-# target_link_libraries(B_BUS PUBLIC ${EXTRA_LIBS})
-
-# add the binary tree to the search path for include files
-# so that we will find BusConfig.h
-# target_include_directories(B_BUS PUBLIC
-#                            "${PROJECT_BINARY_DIR}"
-#                             ${EXTRA_INCLUDES}
-#                            )
-
-# add the executable
-# add_executable(B_BUS B_BUS.cxx)
-# add the install targets
-# install(TARGETS B_BUS DESTINATION bin)
-# install(FILES "${PROJECT_BINARY_DIR}/BusConfig.h"
-#   DESTINATION include
-#   )
- 
+# 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)
+endif()

--
Gitblit v1.8.0