From 4b7d72629bb5b913b312769bd1757e141928b2de Mon Sep 17 00:00:00 2001 From: lichao <lichao@aiotlink.com> Date: 星期五, 16 四月 2021 14:27:02 +0800 Subject: [PATCH] add status box function; center run single inst. --- CMakeLists.txt | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cc97bc4..fa3cc44 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,25 +1,24 @@ cmake_minimum_required(VERSION 3.5) # set the project name and version -project(B_BUS VERSION 2.2) +project(BHomeBus VERSION 1.0) -# specify the C++ standard -set(CMAKE_CXX_STANDARD 14) -set(CMAKE_CXX_STANDARD_REQUIRED True) +include(cmake_options.cmake) -if(CMAKE_GENERATOR MATCHES "Ninja") - #check_and_add_flag(DIAGNOSTICS_COLOR -fdiagnostics-color) - set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -fdiagnostics-color=always) -endif() # 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}/bin") -option(BUILD_SHARED_LIBS "Build using shared libraries" ON) +#option(BUILD_SHARED_LIBS "Build using shared libraries" ON) +#option(BUILD_STATIC_LIBS "Build using static libraries" ON) -include_directories(${PROJECT_SOURCE_DIR}/include) +add_subdirectory(${PROJECT_SOURCE_DIR}/proto/cpp proto) +include_directories(${CMAKE_CURRENT_BINARY_DIR}/proto) +include_directories(${PROJECT_SOURCE_DIR}/box) add_subdirectory(${PROJECT_SOURCE_DIR}/src) +add_subdirectory(${PROJECT_SOURCE_DIR}/box) add_subdirectory(${PROJECT_SOURCE_DIR}/utest) + -- Gitblit v1.8.0