From f3314337c331b2dcaaf3743d92f8d498b22b126d Mon Sep 17 00:00:00 2001 From: Luis Caro Campos <3535649+jcar87@users.noreply.github.com> Date: Fri, 2 Jun 2023 14:22:02 +0100 Subject: [PATCH] (#17788) jasper: remove windows sdk workaround * jasper: remove windows sdk workaround * Update conanfile.py --- recipes/jasper/all/conanfile.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/recipes/jasper/all/conanfile.py b/recipes/jasper/all/conanfile.py index 86a1c7f3eefd50..6bc3bfb690d58a 100644 --- a/recipes/jasper/all/conanfile.py +++ b/recipes/jasper/all/conanfile.py @@ -2,7 +2,6 @@ from conan.tools.build import cross_building from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout from conan.tools.files import apply_conandata_patches, copy, export_conandata_patches, get, rm, rmdir, save -from conan.tools.microsoft import is_msvc from conan.tools.scm import Version import os import textwrap @@ -75,12 +74,6 @@ def generate(self): tc.cache_variables["JAS_CROSSCOMPILING"] = True tc.cache_variables["JAS_STDC_VERSION"] = "199901L" - # TODO: Remove after fixing https://github.com/conan-io/conan-center-index/issues/13159 - # C3I workaround to force CMake to choose the highest version of - # the windows SDK available in the system - if is_msvc(self) and not self.conf.get("tools.cmake.cmaketoolchain:system_version"): - tc.variables["CMAKE_SYSTEM_VERSION"] = "10.0" - tc.generate() cmakedeps = CMakeDeps(self)