diff --git a/recipes/asn1c/all/conanfile.py b/recipes/asn1c/all/conanfile.py index 1f1acf7b8447ab..c1da5dc7fcbfe4 100644 --- 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 index a0efba939dfbc6..aa618b635900e0 100644 --- 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 index 90acae7896df9a..ed96bb307a88d6 100644 --- 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 deleted file mode 100644 index 91630d79f4abb3..00000000000000 --- a/recipes/asn1c/all/test_v1_package/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -cmake_minimum_required(VERSION 3.15) -project(test_package) - -include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) -conan_basic_setup(TARGETS) - -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package/ - ${CMAKE_CURRENT_BINARY_DIR}/test_package/) diff --git a/recipes/asn1c/all/test_v1_package/conanfile.py b/recipes/asn1c/all/test_v1_package/conanfile.py deleted file mode 100644 index 411a12bc7af40f..00000000000000 --- a/recipes/asn1c/all/test_v1_package/conanfile.py +++ /dev/null @@ -1,27 +0,0 @@ -from conans import CMake -from conan import ConanFile -from conan.tools.files import copy -from conan.tools.build import cross_building -import os - - -class TestPackageConan(ConanFile): - settings = "os", "arch", "compiler", "build_type" - - generators = "cmake", "cmake_find_package_multi" - - def build_requirements(self): - self.tool_requires(str(self.requires["asn1c"])) - - def build(self): - if not cross_building(self): - copy(self, "MyModule.asn1", src=self.source_folder, dst=self.build_folder) - cmake = CMake(self) - cmake.definitions["SUPPORT_PATH"] = self.deps_env_info["asn1c"].SUPPORT_PATH - cmake.configure() - cmake.build() - - def test(self): - if not cross_building(self): - bin_path = os.path.join("bin", "test_package") - self.run(bin_path, run_environment=True)