From 1723b98342f1e644806a693e3ca1c7d4e9f6aadc Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Sun, 8 Sep 2024 19:31:33 +0300 Subject: [PATCH] mysql-connector-cpp: don't move project() in CMakeLists.txt --- recipes/mysql-connector-cpp/all/conandata.yml | 2 +- .../9.0.0/0001-override-cmake-policy-version.patch | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/recipes/mysql-connector-cpp/all/conandata.yml b/recipes/mysql-connector-cpp/all/conandata.yml index 76bb1f03918af..98156c4cfa159 100644 --- a/recipes/mysql-connector-cpp/all/conandata.yml +++ b/recipes/mysql-connector-cpp/all/conandata.yml @@ -5,7 +5,7 @@ sources: patches: "9.0.0": - patch_file: "patches/9.0.0/0001-override-cmake-policy-version.patch" - patch_description: "Set CMake policy version to 3.15, move project() statement" + patch_description: "Set CMake policy version to 3.15" patch_type: "conan" - patch_file: "patches/9.0.0/0002-rename-find_dependency.patch" patch_description: "Rename find_dependency() to avoid conflicts with the official CMake function" diff --git a/recipes/mysql-connector-cpp/all/patches/9.0.0/0001-override-cmake-policy-version.patch b/recipes/mysql-connector-cpp/all/patches/9.0.0/0001-override-cmake-policy-version.patch index 8007cf0e4bedb..b0adb6c08cb9c 100644 --- a/recipes/mysql-connector-cpp/all/patches/9.0.0/0001-override-cmake-policy-version.patch +++ b/recipes/mysql-connector-cpp/all/patches/9.0.0/0001-override-cmake-policy-version.patch @@ -17,23 +17,15 @@ index 341ed2de..4d747849 100644 -CMAKE_MINIMUM_REQUIRED(VERSION 3.8) +CMAKE_MINIMUM_REQUIRED(VERSION 3.15) -+PROJECT(MySQL_CONCPP) -+ -CMAKE_POLICY(VERSION 3.1) -cmake_policy(SET CMP0022 NEW) - - - SET(BUILDTYPE_DOCSTRING -@@ -73,7 +73,7 @@ endif() - - ########################################################################## - --PROJECT(MySQL_CONCPP) ++ + - # Load cmake modules + SET(BUILDTYPE_DOCSTRING + @@ -87,7 +87,7 @@ # Detect if we are configured as stand-alone project, or sub-project. #