natas_hw
/
grpc
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

addressed comments

This commit is contained in:
Bill Feng 2019-03-21 10:29:32 -07:00
parent 3a8e9bd465
commit ddae4333fa
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/benchmark.cmake
View File

@ -12,9 +12,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
set(BENCHMARK_ENABLE_GTEST_TESTS OFF CACHE BOOL "Turn off gTest in gBenchmark")
if("${gRPC_BENCHMARK_PROVIDER}" STREQUAL "module") if("${gRPC_BENCHMARK_PROVIDER}" STREQUAL "module")
set(BENCHMARK_ENABLE_GTEST_TESTS OFF CACHE BOOL "Turn off gTest in gBenchmark")
if(NOT BENCHMARK_ROOT_DIR) if(NOT BENCHMARK_ROOT_DIR)
set(BENCHMARK_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/benchmark) set(BENCHMARK_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/third_party/benchmark)
endif() endif()

2
templates/CMakeLists.txt.template
View File

@ -53,7 +53,7 @@
deps.append("${_gRPC_BENCHMARK_LIBRARIES}") deps.append("${_gRPC_BENCHMARK_LIBRARIES}")
else: else:
deps.append(d) deps.append(d)
if target_dict.build == 'test' or target_dict.build == 'private' and target_dict.language == 'c++': if (target_dict.build == 'test' or target_dict.build == 'private') and target_dict.language == 'c++':
deps.append("${_gRPC_GFLAGS_LIBRARIES}") deps.append("${_gRPC_GFLAGS_LIBRARIES}")
return deps return deps