From 5a1ec105567f064d0220d2195dd1765f609bb499 Mon Sep 17 00:00:00 2001 From: Fu Juntang <StrongTiger_001@163.com> Date: 星期五, 03 九月 2021 17:46:19 +0800 Subject: [PATCH] Merge branch 'master' of http://os.smartai.com:9091/valib/c_bhomebus --- CMakeLists.txt | 32 ++++++++++++++++++++++++-------- 1 files changed, 24 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 00acf78..fd63739 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,32 @@ # 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) +list(APPEND EXTRA_LIBS ${PROJECT_SOURCE_DIR}/lib/libusgcommon.a pthread rt protobuf protobuf-lite.a) -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) + include_directories(${CMAKE_CURRENT_BINARY_DIR}/proto) + #add_subdirectory(${PROJECT_SOURCE_DIR}/shm_util) +endif() + +add_definitions("-DPROTOBUF_USS_DLLS") + -- Gitblit v1.8.0