Skip to content

Commit

Permalink
(#25134) [systemc] Re-enable Conan 1.x build
Browse files Browse the repository at this point in the history
Signed-off-by: Uilian Ries <uilianries@gmail.com>
  • Loading branch information
uilianries authored Sep 5, 2024
1 parent 177a639 commit 87e81b6
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions recipes/systemc/all/conanfile.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
from conan import ConanFile, conan_version
from conan import ConanFile
from conan.errors import ConanInvalidConfiguration
from conan.tools.apple import is_apple_os
from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rmdir
from conan.tools.microsoft import is_msvc
from conan.tools.scm import Version
import os

required_conan_version = ">=1.53.0"
Expand Down Expand Up @@ -70,15 +69,6 @@ def validate(self):
"Building SystemC as a shared library on Windows is currently not supported"
)

if (
conan_version.major == 1
and self.settings.compiler == "gcc"
and Version(self.settings.compiler.version) <= "5"
):
raise ConanInvalidConfiguration(
f"GCC {self.settings.compiler.version} is not supported by SystemC on Conan v1"
)

def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True)

Expand Down

0 comments on commit 87e81b6

Please sign in to comment.