This is an automated email from the ASF dual-hosted git repository.
jamesge pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-brpc.git
The following commit(s) were added to refs/heads/master by this push:
new 328e3d0 add_cmake_dependencies
new 7906e5f Merge pull request #1000 from zyearn/add_cmake_dependencies
328e3d0 is described below
commit 328e3d05409a7b3b130449ac70e11f683c2d24fa
Author: zhujiashun <[email protected]>
AuthorDate: Tue Dec 24 17:55:36 2019 +0800
add_cmake_dependencies
---
src/CMakeLists.txt | 1 +
test/CMakeLists.txt | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7d9a29c..ee616eb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -25,6 +25,7 @@ include_directories(${PROJECT_SOURCE_DIR}/src)
add_library(BUTIL_LIB OBJECT ${BUTIL_SOURCES})
add_library(SOURCES_LIB OBJECT ${SOURCES})
+add_dependencies(SOURCES_LIB PROTO_LIB)
# shared library needs POSITION_INDEPENDENT_CODE
set_property(TARGET ${SOURCES_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f3642de..f6ff9e2 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -191,6 +191,7 @@ endif()
add_library(BUTIL_DEBUG_LIB OBJECT ${BUTIL_SOURCES})
add_library(SOURCES_DEBUG_LIB OBJECT ${SOURCES})
+add_dependencies(SOURCES_DEBUG_LIB PROTO_LIB)
# shared library needs POSITION_INDEPENDENT_CODE
set_property(TARGET ${BUTIL_DEBUG_LIB} PROPERTY POSITION_INDEPENDENT_CODE 1)
@@ -235,8 +236,7 @@ add_test(NAME test_bvar COMMAND test_bvar)
file(GLOB BTHREAD_UNITTESTS "bthread*unittest.cpp")
foreach(BTHREAD_UT ${BTHREAD_UNITTESTS})
get_filename_component(BTHREAD_UT_WE ${BTHREAD_UT} NAME_WE)
- add_executable(${BTHREAD_UT_WE} ${BTHREAD_UT}
- $<TARGET_OBJECTS:TEST_PROTO_LIB>)
+ add_executable(${BTHREAD_UT_WE} ${BTHREAD_UT})
target_link_libraries(${BTHREAD_UT_WE} gtest_main
brpc-shared-debug
${GPERFTOOLS_LIBRARIES})
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
