Delete cmake/CMakeLists.txt in favor of CMakeLists.txt (#12295)

This fixes https://github.com/protocolbuffers/protobuf/issues/12263, but we will not cherrypick to 22.x since it could be breaking.

Closes #12295

COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/12295 from deannagarcia:deleteExtraCmakeFile 8fe901aee2
PiperOrigin-RevId: 518456432
pull/12250/head
deannagarcia 2 years ago committed by Copybara-Service
parent e56cf5d8d4
commit dbc918c6d0
  1. 1
      BUILD.bazel
  2. 9
      cmake/CMakeLists.txt

@ -566,7 +566,6 @@ pkg_files(
"LICENSE",
"README.md",
"WORKSPACE",
"cmake/CMakeLists.txt",
"cmake/README.md",
"generate_descriptor_proto.sh",
"maven_install.json",

@ -1,9 +0,0 @@
cmake_minimum_required(VERSION 3.5)
message(DEPRECATION "Calling of cmake with source directory set to \"cmake\" subdirectory of Protocol Buffers project is deprecated. Top-level directory of Protocol Buffers project should be used instead.")
project(protobuf C CXX)
set(protobuf_DEPRECATED_CMAKE_SUBDIRECTORY_USAGE TRUE)
include(../CMakeLists.txt)
Loading…
Cancel
Save