revert flag name of glog to WITH_GLOG in cmake

CMakeLists.txt

@@ -22,15 +22,16 @@ else()
     message(WARNING "You are using an unsupported compiler! Compilation has only been tested with Clang and GCC.")
 endif()
 
-option(BRPC_WITH_GLOG "With glog" OFF)
+option(WITH_GLOG "With glog" OFF)
 option(DEBUG "Print debug logs" OFF)
 option(WITH_DEBUG_SYMBOLS "With debug symbols" ON)
 option(WITH_THRIFT "With thrift framed protocol supported" OFF)
 option(BUILD_UNIT_TESTS "Whether to build unit tests" OFF)
 
 set(WITH_GLOG_VAL "0")
-if(BRPC_WITH_GLOG)
+if(WITH_GLOG)
     set(WITH_GLOG_VAL "1")
+    set(BRPC_WITH_GLOG 1)
 endif()
 
 if(WITH_DEBUG_SYMBOLS)
@@ -121,7 +122,7 @@ if ((NOT LEVELDB_INCLUDE_PATH) OR (NOT LEVELDB_LIB))
     message(FATAL_ERROR "Fail to find leveldb")
 endif()
 
-if(BRPC_WITH_GLOG)
+if(WITH_GLOG)
     find_path(GLOG_INCLUDE_PATH NAMES glog/logging.h)
     find_library(GLOG_LIB NAMES glog)
     if((NOT GLOG_INCLUDE_PATH) OR (NOT GLOG_LIB))
@@ -165,7 +166,7 @@ set(DYNAMIC_LIB
     )
 set(BRPC_PRIVATE_LIBS "-lgflags -lprotobuf -lleveldb -lprotoc -lssl -lcrypto -ldl -lz")
 
-if(BRPC_WITH_GLOG)
+if(WITH_GLOG)
     set(DYNAMIC_LIB ${DYNAMIC_LIB} ${GLOG_LIB})
     set(BRPC_PRIVATE_LIBS "${BRPC_PRIVATE_LIBS} -lglog")
 endif()

docs/cn/getting_started.md

@@ -84,7 +84,7 @@ To change compiler to clang, overwrite environment variable CC and CXX to clang
 
 To not link debugging symbols, use `cmake -DWITH_DEBUG_SYMBOLS=OFF ..` and compiled binaries will be much smaller.
 
-To use brpc with glog, add `-DBRPC_WITH_GLOG=ON`.
+To use brpc with glog, add `-DWITH_GLOG=ON`.
 
 To enable [thrift support](../en/thrift.md), install thrift first and add `-DWITH_THRIFT=ON`.
 
@@ -175,7 +175,7 @@ To change compiler to clang, overwrite environment variable CC and CXX to clang
 
 To not link debugging symbols, use `cmake -DWITH_DEBUG_SYMBOLS=OFF ..` and compiled binaries will be much smaller.
 
-To use brpc with glog, add `-DBRPC_WITH_GLOG=ON`.
+To use brpc with glog, add `-DWITH_GLOG=ON`.
 
 To enable [thrift support](../en/thrift.md), install thrift first and add `-DWITH_THRIFT=ON`.
 
@@ -249,7 +249,7 @@ To change compiler to clang, overwrite environment variable CC and CXX to clang
 
 To not link debugging symbols, use `cmake -DWITH_DEBUG_SYMBOLS=OFF ..` and compiled binaries will be much smaller.
 
-To use brpc with glog, add `-DBRPC_WITH_GLOG=ON`.
+To use brpc with glog, add `-DWITH_GLOG=ON`.
 
 To enable [thrift support](../en/thrift.md), install thrift first and add `-DWITH_THRIFT=ON`.
 
@@ -316,7 +316,7 @@ mkdir bld && cd bld && cmake .. && make
 
 To not link debugging symbols, use `cmake -DWITH_DEBUG_SYMBOLS=OFF ..` and compiled binaries will be much smaller.
 
-To use brpc with glog, add `-DBRPC_WITH_GLOG=ON`.
+To use brpc with glog, add `-DWITH_GLOG=ON`.
 
 To enable [thrift support](../en/thrift.md), install thrift first and add `-DWITH_THRIFT=ON`.
 
@@ -392,7 +392,7 @@ When you remove tcmalloc, not only remove the linkage with tcmalloc but also the
 
 ## glog: 3.3+
 
-brpc implements a default [logging utility](../../src/butil/logging.h) which conflicts with glog. To replace this with glog, add *--with-glog* to config_brpc.sh or add `-DBRPC_WITH_GLOG=ON` to cmake.
+brpc implements a default [logging utility](../../src/butil/logging.h) which conflicts with glog. To replace this with glog, add *--with-glog* to config_brpc.sh or add `-DWITH_GLOG=ON` to cmake.
 
 ## valgrind: 3.8+