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 1b90ea1 unify dynamic link option in make and cmake
new 54025e4 Merge pull request #904 from zyearn/refine_cmake_example
1b90ea1 is described below
commit 1b90ea18d95ddaff5b1afd17eb1326a100cf7b33
Author: zhujiashun <zhujiashun2...@gmail.com>
AuthorDate: Mon Aug 26 14:32:29 2019 +0800
unify dynamic link option in make and cmake
---
docs/cn/getting_started.md | 6 +++---
example/asynchronous_echo_c++/CMakeLists.txt | 4 ++--
example/auto_concurrency_limiter/CMakeLists.txt | 4 ++--
example/backup_request_c++/CMakeLists.txt | 4 ++--
example/cancel_c++/CMakeLists.txt | 4 ++--
example/cascade_echo_c++/CMakeLists.txt | 4 ++--
example/dynamic_partition_echo_c++/CMakeLists.txt | 4 ++--
example/echo_c++/CMakeLists.txt | 4 ++--
example/echo_c++_hulu_pbrpc/CMakeLists.txt | 4 ++--
example/echo_c++_sofa_pbrpc/CMakeLists.txt | 4 ++--
example/echo_c++_ubrpc_compack/CMakeLists.txt | 4 ++--
example/grpc_c++/CMakeLists.txt | 4 ++--
example/http_c++/CMakeLists.txt | 4 ++--
example/memcache_c++/CMakeLists.txt | 4 ++--
example/multi_threaded_echo_c++/CMakeLists.txt | 4 ++--
example/multi_threaded_echo_fns_c++/CMakeLists.txt | 4 ++--
example/multi_threaded_mcpack_c++/CMakeLists.txt | 4 ++--
example/nshead_extension_c++/CMakeLists.txt | 4 ++--
example/nshead_pb_extension_c++/CMakeLists.txt | 4 ++--
example/parallel_echo_c++/CMakeLists.txt | 4 ++--
example/partition_echo_c++/CMakeLists.txt | 4 ++--
example/redis_c++/CMakeLists.txt | 4 ++--
example/selective_echo_c++/CMakeLists.txt | 4 ++--
example/session_data_and_thread_local/CMakeLists.txt | 4 ++--
example/streaming_echo_c++/CMakeLists.txt | 4 ++--
25 files changed, 51 insertions(+), 51 deletions(-)
diff --git a/docs/cn/getting_started.md b/docs/cn/getting_started.md
index 39cffc8..6c5410f 100644
--- a/docs/cn/getting_started.md
+++ b/docs/cn/getting_started.md
@@ -90,7 +90,7 @@ $ mkdir bld && cd bld && cmake .. && make
$ ./echo_server &
$ ./echo_client
```
-Examples link brpc statically, if you need to link the shared version, use
`cmake -DEXAMPLE_LINK_SO=ON ..`
+Examples link brpc statically, if you need to link the shared version, use
`cmake -DLINK_SO=ON ..`
**Run tests**
```shell
@@ -180,7 +180,7 @@ $ mkdir bld && cd bld && cmake .. && make
$ ./echo_server &
$ ./echo_client
```
-Examples link brpc statically, if you need to link the shared version, use
`cmake -DEXAMPLE_LINK_SO=ON ..`
+Examples link brpc statically, if you need to link the shared version, use
`cmake -DLINK_SO=ON ..`
**Run tests**
```shell
@@ -318,7 +318,7 @@ $ mkdir bld && cd bld && cmake .. && make
$ ./echo_server &
$ ./echo_client
```
-Examples link brpc statically, if you need to link the shared version, use
`cmake -DEXAMPLE_LINK_SO=ON ..`
+Examples link brpc statically, if you need to link the shared version, use
`cmake -DLINK_SO=ON ..`
**Run tests**
```shell
diff --git a/example/asynchronous_echo_c++/CMakeLists.txt
b/example/asynchronous_echo_c++/CMakeLists.txt
index 91c3953..c4408e4 100644
--- a/example/asynchronous_echo_c++/CMakeLists.txt
+++ b/example/asynchronous_echo_c++/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(asynchronous_echo_c++ C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${PROJECT_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -28,7 +28,7 @@ if (NOT THRIFTNB_LIB)
endif()
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/auto_concurrency_limiter/CMakeLists.txt
b/example/auto_concurrency_limiter/CMakeLists.txt
index 218f059..772093e 100644
--- a/example/auto_concurrency_limiter/CMakeLists.txt
+++ b/example/auto_concurrency_limiter/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(asynchronous_echo_c++ C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${CMAKE_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -17,7 +17,7 @@ protobuf_generate_cpp(PROTO_SRC PROTO_HEADER cl_test.proto)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/backup_request_c++/CMakeLists.txt
b/example/backup_request_c++/CMakeLists.txt
index 3275064..2b6032f 100644
--- a/example/backup_request_c++/CMakeLists.txt
+++ b/example/backup_request_c++/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(backup_request_c++ C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${PROJECT_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -28,7 +28,7 @@ if (NOT THRIFTNB_LIB)
endif()
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/cancel_c++/CMakeLists.txt
b/example/cancel_c++/CMakeLists.txt
index 998e03e..d365a54 100644
--- a/example/cancel_c++/CMakeLists.txt
+++ b/example/cancel_c++/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(cancel_c++ C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${PROJECT_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -28,7 +28,7 @@ if (NOT THRIFTNB_LIB)
endif()
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/cascade_echo_c++/CMakeLists.txt
b/example/cascade_echo_c++/CMakeLists.txt
index bc530e0..e4fa9b5 100644
--- a/example/cascade_echo_c++/CMakeLists.txt
+++ b/example/cascade_echo_c++/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(cascade_echo_c++ C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${PROJECT_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -27,7 +27,7 @@ if (NOT THRIFTNB_LIB)
endif()
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/dynamic_partition_echo_c++/CMakeLists.txt
b/example/dynamic_partition_echo_c++/CMakeLists.txt
index a89d3ed..e383fff 100644
--- a/example/dynamic_partition_echo_c++/CMakeLists.txt
+++ b/example/dynamic_partition_echo_c++/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(dynamic_partition_echo_c++ C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${PROJECT_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -32,7 +32,7 @@ if (NOT THRIFTNB_LIB)
endif()
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/echo_c++/CMakeLists.txt b/example/echo_c++/CMakeLists.txt
index 325918d..ac37e21 100644
--- a/example/echo_c++/CMakeLists.txt
+++ b/example/echo_c++/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(echo_c++ C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${PROJECT_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -28,7 +28,7 @@ if (NOT THRIFTNB_LIB)
endif()
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/echo_c++_hulu_pbrpc/CMakeLists.txt
b/example/echo_c++_hulu_pbrpc/CMakeLists.txt
index ced2f81..1e50fdf 100644
--- a/example/echo_c++_hulu_pbrpc/CMakeLists.txt
+++ b/example/echo_c++_hulu_pbrpc/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(echo_c++_hulu_pbrpc C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${PROJECT_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -28,7 +28,7 @@ if (NOT THRIFTNB_LIB)
endif()
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/echo_c++_sofa_pbrpc/CMakeLists.txt
b/example/echo_c++_sofa_pbrpc/CMakeLists.txt
index 5cdf1e3..a41225a 100644
--- a/example/echo_c++_sofa_pbrpc/CMakeLists.txt
+++ b/example/echo_c++_sofa_pbrpc/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(echo_c++_sofa_pbrpc C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${PROJECT_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -28,7 +28,7 @@ if (NOT THRIFTNB_LIB)
endif()
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/echo_c++_ubrpc_compack/CMakeLists.txt
b/example/echo_c++_ubrpc_compack/CMakeLists.txt
index ff12658..56e68b2 100644
--- a/example/echo_c++_ubrpc_compack/CMakeLists.txt
+++ b/example/echo_c++_ubrpc_compack/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(echo_c++_ubrpc_compack C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${PROJECT_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -28,7 +28,7 @@ if (NOT THRIFTNB_LIB)
endif()
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/grpc_c++/CMakeLists.txt b/example/grpc_c++/CMakeLists.txt
index c7b0aba..1e9461a 100644
--- a/example/grpc_c++/CMakeLists.txt
+++ b/example/grpc_c++/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(grpc_c++ C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${CMAKE_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -21,7 +21,7 @@ find_library(GPERFTOOLS_LIBRARIES NAMES tcmalloc_and_profiler)
include_directories(${GPERFTOOLS_INCLUDE_DIR})
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/http_c++/CMakeLists.txt b/example/http_c++/CMakeLists.txt
index 0f34c85..0e67c8b 100644
--- a/example/http_c++/CMakeLists.txt
+++ b/example/http_c++/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(http_c++ C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${PROJECT_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -32,7 +32,7 @@ find_library(GPERFTOOLS_LIBRARIES NAMES tcmalloc_and_profiler)
include_directories(${GPERFTOOLS_INCLUDE_DIR})
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/memcache_c++/CMakeLists.txt
b/example/memcache_c++/CMakeLists.txt
index 0fbaaa4..d01e786 100644
--- a/example/memcache_c++/CMakeLists.txt
+++ b/example/memcache_c++/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(memcache_c++ C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${PROJECT_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -28,7 +28,7 @@ if (NOT THRIFTNB_LIB)
endif()
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/multi_threaded_echo_c++/CMakeLists.txt
b/example/multi_threaded_echo_c++/CMakeLists.txt
index d063335..3aa61bd 100644
--- a/example/multi_threaded_echo_c++/CMakeLists.txt
+++ b/example/multi_threaded_echo_c++/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(multi_threaded_echo_c++ C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${PROJECT_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -32,7 +32,7 @@ find_library(GPERFTOOLS_LIBRARIES NAMES tcmalloc_and_profiler)
include_directories(${GPERFTOOLS_INCLUDE_DIR})
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/multi_threaded_echo_fns_c++/CMakeLists.txt
b/example/multi_threaded_echo_fns_c++/CMakeLists.txt
index 2840263..860f118 100644
--- a/example/multi_threaded_echo_fns_c++/CMakeLists.txt
+++ b/example/multi_threaded_echo_fns_c++/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(multi_threaded_echo_fns_c++ C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${PROJECT_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -32,7 +32,7 @@ find_library(GPERFTOOLS_LIBRARIES NAMES tcmalloc_and_profiler)
include_directories(${GPERFTOOLS_INCLUDE_DIR})
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/multi_threaded_mcpack_c++/CMakeLists.txt
b/example/multi_threaded_mcpack_c++/CMakeLists.txt
index 9dcbe12..f7d2d91 100644
--- a/example/multi_threaded_mcpack_c++/CMakeLists.txt
+++ b/example/multi_threaded_mcpack_c++/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(multi_threaded_mcpack_c++ C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${PROJECT_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -32,7 +32,7 @@ find_library(GPERFTOOLS_LIBRARIES NAMES tcmalloc_and_profiler)
include_directories(${GPERFTOOLS_INCLUDE_DIR})
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/nshead_extension_c++/CMakeLists.txt
b/example/nshead_extension_c++/CMakeLists.txt
index a5ef77f..d8f2302 100644
--- a/example/nshead_extension_c++/CMakeLists.txt
+++ b/example/nshead_extension_c++/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(nshead_extension_c++ C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${PROJECT_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -28,7 +28,7 @@ if (NOT THRIFTNB_LIB)
endif()
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/nshead_pb_extension_c++/CMakeLists.txt
b/example/nshead_pb_extension_c++/CMakeLists.txt
index 0042a82..336dc3a 100644
--- a/example/nshead_pb_extension_c++/CMakeLists.txt
+++ b/example/nshead_pb_extension_c++/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(nshead_pb_extension_c++ C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${PROJECT_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -28,7 +28,7 @@ if (NOT THRIFTNB_LIB)
endif()
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/parallel_echo_c++/CMakeLists.txt
b/example/parallel_echo_c++/CMakeLists.txt
index fbe56ce..29b1658 100644
--- a/example/parallel_echo_c++/CMakeLists.txt
+++ b/example/parallel_echo_c++/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(parallel_echo_c++ C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${PROJECT_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -32,7 +32,7 @@ find_library(GPERFTOOLS_LIBRARIES NAMES tcmalloc_and_profiler)
include_directories(${GPERFTOOLS_INCLUDE_DIR})
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/partition_echo_c++/CMakeLists.txt
b/example/partition_echo_c++/CMakeLists.txt
index ffab137..e48a1c9 100644
--- a/example/partition_echo_c++/CMakeLists.txt
+++ b/example/partition_echo_c++/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(partition_echo_c++ C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${PROJECT_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -32,7 +32,7 @@ find_library(GPERFTOOLS_LIBRARIES NAMES tcmalloc_and_profiler)
include_directories(${GPERFTOOLS_INCLUDE_DIR})
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/redis_c++/CMakeLists.txt b/example/redis_c++/CMakeLists.txt
index 82096c7..9fd730a 100644
--- a/example/redis_c++/CMakeLists.txt
+++ b/example/redis_c++/CMakeLists.txt
@@ -9,7 +9,7 @@ project(redis_c++ C CXX)
# sudo yum install readline-devel
# sudo yum install ncurses-devel
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${PROJECT_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -33,7 +33,7 @@ if (NOT THRIFTNB_LIB)
endif()
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/selective_echo_c++/CMakeLists.txt
b/example/selective_echo_c++/CMakeLists.txt
index 517464d..a360607 100644
--- a/example/selective_echo_c++/CMakeLists.txt
+++ b/example/selective_echo_c++/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(selective_echo_c++ C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${PROJECT_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -32,7 +32,7 @@ find_library(GPERFTOOLS_LIBRARIES NAMES tcmalloc_and_profiler)
include_directories(${GPERFTOOLS_INCLUDE_DIR})
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/session_data_and_thread_local/CMakeLists.txt
b/example/session_data_and_thread_local/CMakeLists.txt
index 02ccd18..8d165ea 100644
--- a/example/session_data_and_thread_local/CMakeLists.txt
+++ b/example/session_data_and_thread_local/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(session_data_and_thread_local C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${PROJECT_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -32,7 +32,7 @@ find_library(GPERFTOOLS_LIBRARIES NAMES tcmalloc_and_profiler)
include_directories(${GPERFTOOLS_INCLUDE_DIR})
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
diff --git a/example/streaming_echo_c++/CMakeLists.txt
b/example/streaming_echo_c++/CMakeLists.txt
index d4436fb..a906796 100644
--- a/example/streaming_echo_c++/CMakeLists.txt
+++ b/example/streaming_echo_c++/CMakeLists.txt
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8.10)
project(streaming_echo_c++ C CXX)
-option(EXAMPLE_LINK_SO "Whether examples are linked dynamically" OFF)
+option(LINK_SO "Whether examples are linked dynamically" OFF)
execute_process(
COMMAND bash -c "find ${PROJECT_SOURCE_DIR}/../.. -type d -regex
\".*output/include$\" | head -n1 | xargs dirname | tr -d '\n'"
@@ -28,7 +28,7 @@ if (NOT THRIFTNB_LIB)
endif()
find_path(BRPC_INCLUDE_PATH NAMES brpc/server.h)
-if(EXAMPLE_LINK_SO)
+if(LINK_SO)
find_library(BRPC_LIB NAMES brpc)
else()
find_library(BRPC_LIB NAMES libbrpc.a brpc)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@brpc.apache.org
For additional commands, e-mail: dev-h...@brpc.apache.org
