From 6e1d3754b80d643fe6663b5ec0ab043697fb69bc Mon Sep 17 00:00:00 2001
From: Jordan Williams <jordan@jwillikers.com>
Date: Mon, 24 Oct 2022 07:49:51 -0500
Subject: [PATCH] eigen: Use export_conanadata_patches and explicit test_type

---
 recipes/eigen/all/conanfile.py                   | 13 ++++++-------
 recipes/eigen/all/test_package/CMakeLists.txt    |  6 +++---
 recipes/eigen/all/test_package/conanfile.py      |  1 +
 recipes/eigen/all/test_package/test_package.cpp  |  4 ++--
 recipes/eigen/all/test_v1_package/CMakeLists.txt |  6 ++----
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/recipes/eigen/all/conanfile.py b/recipes/eigen/all/conanfile.py
index 54efcdf97a0f3..f51dcb30af47e 100644
--- a/recipes/eigen/all/conanfile.py
+++ b/recipes/eigen/all/conanfile.py
@@ -2,9 +2,9 @@
 
 from conan import ConanFile
 from conan.tools.cmake import CMake, cmake_layout, CMakeToolchain
-from conan.tools.files import apply_conandata_patches, copy, get, rmdir
+from conan.tools.files import apply_conandata_patches, export_conandata_patches, copy, get, rmdir
 
-required_conan_version = ">=1.50.0"
+required_conan_version = ">=1.52.0"
 
 
 class EigenConan(ConanFile):
@@ -13,8 +13,7 @@ class EigenConan(ConanFile):
     homepage = "http://eigen.tuxfamily.org"
     description = "Eigen is a C++ template library for linear algebra: matrices, vectors," \
                   " numerical solvers, and related algorithms."
-    topics = ("eigen", "algebra", "linear-algebra", "vector", "numerical")
-
+    topics = ("algebra", "linear-algebra", "matrix", "vector", "numerical")
     settings = "os", "arch", "compiler", "build_type"
     options = {
         "MPL2_only": [True, False],
@@ -31,14 +30,14 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def export_sources(self):
-        for patch in self.conan_data.get("patches", {}).get(self.version, []):
-            copy(self, patch["patch_file"], self.recipe_folder, self.export_sources_folder)
+        export_conandata_patches(self)
 
     def package_id(self):
         self.info.clear()
 
     def source(self):
-        get(self, **self.conan_data["sources"][self.version], strip_root=True)
+        get(self, **self.conan_data["sources"][self.version],
+            destination=self.source_folder, strip_root=True)
 
     def generate(self):
         tc = CMakeToolchain(self)
diff --git a/recipes/eigen/all/test_package/CMakeLists.txt b/recipes/eigen/all/test_package/CMakeLists.txt
index c4fdf0bd1c765..7a24919989d14 100644
--- a/recipes/eigen/all/test_package/CMakeLists.txt
+++ b/recipes/eigen/all/test_package/CMakeLists.txt
@@ -1,7 +1,7 @@
-cmake_minimum_required(VERSION 3.16)
-project(test_package)
+cmake_minimum_required(VERSION 3.1)
+project(test_package LANGUAGES CXX)
 
 find_package(Eigen3 REQUIRED CONFIG)
 
 add_executable(${PROJECT_NAME} test_package.cpp)
-target_link_libraries(${PROJECT_NAME} Eigen3::Eigen)
+target_link_libraries(${PROJECT_NAME} PRIVATE Eigen3::Eigen)
diff --git a/recipes/eigen/all/test_package/conanfile.py b/recipes/eigen/all/test_package/conanfile.py
index cf2b5ffb9883d..c0ba081cf41ea 100644
--- a/recipes/eigen/all/test_package/conanfile.py
+++ b/recipes/eigen/all/test_package/conanfile.py
@@ -7,6 +7,7 @@
 class TestPackageConan(ConanFile):
     settings = "os", "arch", "compiler", "build_type"
     generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv"
+    test_type = "explicit"
 
     def requirements(self):
         self.requires(self.tested_reference_str)
diff --git a/recipes/eigen/all/test_package/test_package.cpp b/recipes/eigen/all/test_package/test_package.cpp
index 69a884db4af91..a253d7f1b2200 100644
--- a/recipes/eigen/all/test_package/test_package.cpp
+++ b/recipes/eigen/all/test_package/test_package.cpp
@@ -9,8 +9,8 @@ int main(void)
     Eigen::MatrixXi A(N, N);
     A.setRandom();
 
-    std::cout << "A =\n" << A << '\n' <<std::endl;
-    std::cout << "A(2..3,:) =\n" << A.middleRows(2, 2) << std::endl;
+    std::cout << "A =\n" << A << "\n\n"
+              << "A(2..3,:) =\n" << A.middleRows(2, 2) << "\n";
 
     return 0;
 }
diff --git a/recipes/eigen/all/test_v1_package/CMakeLists.txt b/recipes/eigen/all/test_v1_package/CMakeLists.txt
index 9883fd61a8a28..925ecbe19e448 100644
--- a/recipes/eigen/all/test_v1_package/CMakeLists.txt
+++ b/recipes/eigen/all/test_v1_package/CMakeLists.txt
@@ -4,7 +4,5 @@ project(test_package)
 include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
 conan_basic_setup(TARGETS)
 
-find_package(Eigen3 REQUIRED CONFIG)
-
-add_executable(${PROJECT_NAME} ../test_package/test_package.cpp)
-target_link_libraries(${PROJECT_NAME} Eigen3::Eigen)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package/
+                 ${CMAKE_CURRENT_BINARY_DIR}/test_package/)