mysql-connector-cpp: drop override-cmake-policy-version.patch

conan-io · Sep 9, 2024 · ed0bb9d · ed0bb9d
1 parent 2f459ec
commit ed0bb9d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 48 deletions.
diff --git a/recipes/mysql-connector-cpp/all/conandata.yml b/recipes/mysql-connector-cpp/all/conandata.yml
@@ -4,9 +4,6 @@ sources:
     sha256: "9d4b90a4efe8861e821136fb3024074d14875749d8b69d1821361b2f2b8bfe55"
 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_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"
       patch_type: "conan"

diff --git a/recipes/mysql-connector-cpp/all/conanfile.py b/recipes/mysql-connector-cpp/all/conanfile.py
@@ -97,6 +97,7 @@ def generate(self):
         tc.cache_variables["WITH_SSL"] = self.dependencies["openssl"].package_folder.replace("\\", "/")
         tc.cache_variables["CMAKE_PREFIX_PATH"] = self.generators_folder.replace("\\", "/")
         tc.cache_variables["IS64BIT"] = True
+        tc.cache_variables["CMAKE_POLICY_DEFAULT_CMP0077"] = "NEW"
         tc.generate()
 
         deps = CMakeDeps(self)

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