Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jasper: remove windows sdk workaround #17788

Merged
merged 2 commits into from
Jun 2, 2023
Merged

jasper: remove windows sdk workaround #17788

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25c1809
jasper: remove windows sdk workaround
jcar87 Jun 1, 2023
14e1dbb
Update conanfile.py
jcar87 Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions recipes/jasper/all/conanfile.py
View file
Open in desktop
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