asn1c: fix test_package

conan-io · Sep 19, 2023 · a93f959 · a93f959
1 parent b013f5d
commit a93f959
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 40 deletions.
diff --git a/recipes/asn1c/all/conanfile.py b/recipes/asn1c/all/conanfile.py
@@ -9,7 +9,7 @@
 from conan.tools.layout import basic_layout
 from conan.tools.microsoft import is_msvc
 
-required_conan_version = ">=1.47.0"
+required_conan_version = ">=1.53.0"
 
 
 class Asn1cConan(ConanFile):
@@ -99,3 +99,4 @@ def package_info(self):
         bin_path = os.path.join(self.package_folder, "bin")
         self.output.info(f"Appending PATH environment variable: {bin_path}")
         self.env_info.PATH.append(bin_path)
+        self.env_info.SUPPORT_PATH = support_path
diff --git a/recipes/asn1c/all/test_package/CMakeLists.txt b/recipes/asn1c/all/test_package/CMakeLists.txt
@@ -1,6 +1,10 @@
 cmake_minimum_required(VERSION 3.15)
 project(test_package C)
 
+if (NOT DEFINED ENV{SUPPORT_PATH})
+    message(FATAL_ERROR "SUPPORT_PATH environment variable not defined")
+endif()
+
 set(STANDARD_ASN1_FILES
  BIT_STRING.c
  INTEGER.c

diff --git a/recipes/asn1c/all/test_package/conanfile.py b/recipes/asn1c/all/test_package/conanfile.py
@@ -8,12 +8,9 @@
 
 class TestPackageConan(ConanFile):
     settings = "os", "arch", "compiler", "build_type"
-    generators = "CMakeToolchain", "CMakeDeps", "VirtualRunEnv"
+    generators = "CMakeToolchain", "CMakeDeps", "VirtualRunEnv", "VirtualBuildEnv"
     test_type = "explicit"
 
-    def requirements(self):
-        self.requires(self.tested_reference_str)
-
     def build_requirements(self):
         self.tool_requires(self.tested_reference_str)
 

diff --git a/recipes/asn1c/all/test_v1_package/CMakeLists.txt b/recipes/asn1c/all/test_v1_package/CMakeLists.txt
diff --git a/recipes/asn1c/all/test_v1_package/conanfile.py b/recipes/asn1c/all/test_v1_package/conanfile.py