Skip to content

Commit

Permalink
(conan-io#17788) jasper: remove windows sdk workaround
Browse files Browse the repository at this point in the history
* jasper: remove windows sdk workaround

* Update conanfile.py
  • Loading branch information
jcar87 authored and pezy committed Jul 15, 2023
1 parent 93d4190 commit f331433
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions recipes/jasper/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit f331433

Please sign in to comment.