From dbc918c6d0adeb7dfe1fc515c01ac0d4d88c88ed Mon Sep 17 00:00:00 2001 From: deannagarcia <69992229+deannagarcia@users.noreply.github.com> Date: Tue, 21 Mar 2023 20:25:42 -0700 Subject: [PATCH] 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 8fe901aee2d7992ee06b9fa2827c76ecc725f39d PiperOrigin-RevId: 518456432 --- BUILD.bazel | 1 - cmake/CMakeLists.txt | 9 --------- 2 files changed, 10 deletions(-) delete mode 100644 cmake/CMakeLists.txt diff --git a/BUILD.bazel b/BUILD.bazel index 3f8e5635e898..cf3352b06d51 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -566,7 +566,6 @@ pkg_files( "LICENSE", "README.md", "WORKSPACE", - "cmake/CMakeLists.txt", "cmake/README.md", "generate_descriptor_proto.sh", "maven_install.json", diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt deleted file mode 100644 index 3849985461ec..000000000000 --- a/cmake/CMakeLists.txt +++ /dev/null @@ -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)