Skip to content

Commit

Permalink
Fix toolchain position variables
Browse files Browse the repository at this point in the history
  • Loading branch information
uilianries authored Dec 21, 2022
1 parent bb7f014 commit 0030837
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions recipes/jasper/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,19 +63,22 @@ def generate(self):
tc.variables["JAS_LIBJPEG_REQUIRED"] = "REQUIRED"
tc.variables["JAS_ENABLE_OPENGL"] = False
tc.variables["JAS_ENABLE_LIBJPEG"] = True

if cross_building(self):
tc.cache_variables["JAS_CROSSCOMPILING"] = True
tc.cache_variables["JAS_STDC_VERSION"] = "199901L"
tc.generate()
tc = CMakeDeps(self)
tc.generate()

# 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)
cmakedeps.generate()

def build(self):
apply_conandata_patches(self)
cmake = CMake(self)
Expand Down

0 comments on commit 0030837

Please sign in to comment.