You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ch...@apache.org on 2018/03/30 18:47:56 UTC

mesos git commit: Temporarily disabled CSI proto compilation in CMake.

Repository: mesos
Updated Branches:
  refs/heads/master 7e58e14de -> 62de7bbfe


Temporarily disabled CSI proto compilation in CMake.

The `major` and `minor` macros defined on some systems conflict with
field names in the CSI v0.1.0 spec proto. Temporarily disable it in
CMake until CSI is bumped to 0.2.

Review: https://reviews.apache.org/r/66371


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/62de7bbf
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/62de7bbf
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/62de7bbf

Branch: refs/heads/master
Commit: 62de7bbfe90ba373075509dfddc23b23239f5cc9
Parents: 7e58e14
Author: Chun-Hung Hsiao <ch...@mesosphere.io>
Authored: Thu Mar 29 16:51:19 2018 -0700
Committer: Chun-Hung Hsiao <ch...@mesosphere.io>
Committed: Fri Mar 30 11:47:05 2018 -0700

----------------------------------------------------------------------
 src/CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/62de7bbf/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fb9e9d4..6fc45db 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,10 +29,6 @@ set(JAVA_PROTOBUF_SRC "")
 # Build the protobuf structs.
 #
 # NOTE: The following `PROTOC_GENERATE` calls will list append to
-# `PUBLIC_PROTO_PATH`, `PUBLIC_PROTOBUF_INCLUDE_DIR` and `PUBLIC_PROTOBUF_SRC`.
-PROTOC_GENERATE(GRPC LIB csi TARGET csi)
-
-# NOTE: The following `PROTOC_GENERATE` calls will list append to
 # `PUBLIC_PROTOBUF_SRC`.
 PROTOC_GENERATE(TARGET mesos/agent/agent)
 PROTOC_GENERATE(TARGET mesos/allocator/allocator)