From ee9de4031d70d69ccfd32d466070d68428dae2b2 Mon Sep 17 00:00:00 2001 From: lichao <lichao@aiotlink.com> Date: 星期三, 19 五月 2021 16:34:20 +0800 Subject: [PATCH] change lib build config. --- src/bh_api.cc | 0 src/CMakeLists.txt | 11 ++++------- box/CMakeLists.txt | 2 +- utest/CMakeLists.txt | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/box/CMakeLists.txt b/box/CMakeLists.txt index a8aa868..d398d08 100644 --- a/box/CMakeLists.txt +++ b/box/CMakeLists.txt @@ -10,7 +10,7 @@ add_library(${Target} ${lib_sources}) add_executable(${BinTarget} ${exe_sources}) -target_link_libraries(${Target} bhome_shmq_static pthread rt) +target_link_libraries(${Target} bhcommon pthread rt) target_link_libraries(${BinTarget} ${Target} boost_filesystem ) set_target_properties(${BinTarget} PROPERTIES OUTPUT_NAME ${Target}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8d9de26..6e85736 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,15 +1,12 @@ file(GLOB sources "./*.cpp" "../log/*.cpp") -set(Target bhome_shmq) -set(TargetStatic bhome_shmq_static) - set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exported_symbols") include_directories(../log) -add_library(${Target} SHARED ${sources}) -add_library(${TargetStatic} STATIC ${sources}) +add_library(bhcommon STATIC ${sources}) set(LogLibs "boost_log;boost_log_setup;boost_thread;boost_filesystem") +target_link_libraries(bhcommon bhome_msg ${LogLibs} pthread rt) -target_link_libraries(${Target} bhome_msg ${LogLibs} pthread rt) -target_link_libraries(${TargetStatic} bhome_msg ${LogLibs} pthread rt) +add_library(bhome_shmq SHARED bh_api.cc) +target_link_libraries(bhome_shmq bhcommon) diff --git a/src/bh_api.cpp b/src/bh_api.cc similarity index 100% rename from src/bh_api.cpp rename to src/bh_api.cc diff --git a/utest/CMakeLists.txt b/utest/CMakeLists.txt index cbe5be7..7047b6f 100644 --- a/utest/CMakeLists.txt +++ b/utest/CMakeLists.txt @@ -5,4 +5,4 @@ include_directories(../src) add_executable(utest ${sources}) -target_link_libraries(utest bhshmqbox boost_test_exec_monitor boost_unit_test_framework boost_timer boost_chrono) +target_link_libraries(utest bhshmqbox bhome_shmq boost_test_exec_monitor boost_unit_test_framework boost_timer boost_chrono) -- Gitblit v1.8.0