Skip to content

Commit c1520a0

Browse files
committed
Update TF to v2.2.0-rc1, drop SYSTEM_PROTOBUF option (no effect)
1 parent e9ec45c commit c1520a0

File tree

2 files changed

+3
-21
lines changed

2 files changed

+3
-21
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# tensorflow_cc
22
[![Build Status](http://ash.floop.cz:8080/buildStatus/icon?job=tensorflow_cc)](http://ash.floop.cz:8080/job/tensorflow_cc/)
3-
[![TF version](https://img.shields.io/badge/TF%20version-2.2.0%20rc0-brightgreen.svg)]()
3+
[![TF version](https://img.shields.io/badge/TF%20version-2.2.0%20rc1-brightgreen.svg)]()
44

55
This repository makes possible the usage of the [TensorFlow C++](https://www.tensorflow.org/api_docs/cc/) API from the outside of the TensorFlow source code folders and without the use of the [Bazel](https://bazel.build/) build system.
66

tensorflow_cc/CMakeLists.txt

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ project(
88
# If enabled, bazel has to be installed.
99
option(ALLOW_CUDA "Try to find and use CUDA." ON)
1010
option(REQUIRE_CUDA "Make sure to find and use CUDA (implies ALLOW_CUDA)." OFF)
11-
set(TENSORFLOW_TAG "v2.2.0-rc0" CACHE STRING "The tensorflow release tag to be checked out (default v2.2.0-rc0).")
12-
# TODO use ${version} when not -rc0
13-
option(SYSTEM_PROTOBUF "Use system protobuf instead of static protobuf from contrib/makefile." OFF)
11+
set(TENSORFLOW_TAG "v2.2.0-rc1" CACHE STRING "The tensorflow release tag to be checked out (default v2.2.0-rc1).")
12+
# TODO use ${version} when not -rc1
1413
set(TARGET_CXX_STANDARD "cxx_std_11" CACHE STRING "C++ standard to be enforced when linking to TensorflowCC targets (e.g., cxx_std_11).")
1514

1615
# -------------
@@ -35,13 +34,6 @@ configure_file("cmake/build_tensorflow.sh.in" "build_tensorflow.sh" @ONLY)
3534

3635
include(TensorflowBase)
3736

38-
# ----------------------------------
39-
# Define Shared Tensorflow Interface
40-
# ----------------------------------
41-
if(SYSTEM_PROTOBUF)
42-
find_package(Protobuf REQUIRED)
43-
endif()
44-
4537
# ------------------------------
4638
# Define Tensorflow_CC Interface
4739
# ------------------------------
@@ -59,16 +51,6 @@ target_link_libraries(
5951
"${CMAKE_INSTALL_PREFIX}/lib/libtensorflow_cc.so.${PROJECT_VERSION_MAJOR}"
6052
dl pthread
6153
)
62-
if(SYSTEM_PROTOBUF)
63-
target_include_directories(
64-
tensorflow_cc INTERFACE
65-
"${Protobuf_INCLUDE_DIRS}"
66-
)
67-
target_link_libraries(
68-
tensorflow_cc INTERFACE
69-
"${Protobuf_LIBRARIES}"
70-
)
71-
endif()
7254

7355
# ----------------------------------------
7456
# Configure CMake Config and Version Files

0 commit comments

Comments
 (0)