Skip to content

Commit 9a5bac6

Browse files
committed
Cmake issue on Linux builds
1 parent f70e8ad commit 9a5bac6

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed

oiio_python/recipes/dependencies/libtiff/conanfile.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import os
22

33
from conan import ConanFile
4-
from conan.errors import ConanInvalidConfiguration
54
from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
65
from conan.tools.files import (
76
apply_conandata_patches,
@@ -82,7 +81,7 @@ def requirements(self):
8281
self.requires("libwebp/1.4.0")
8382

8483
def build_requirements(self):
85-
self.tool_requires("cmake/[>=3.19 <4]")
84+
self.tool_requires("cmake/[>=3.18 <4]")
8685

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

oiio_python/recipes/dependencies/libtiff/test_package/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.1)
1+
cmake_minimum_required(VERSION 3.15)
22
project(test_package LANGUAGES C)
33

44
find_package(TIFF REQUIRED)

oiio_python/recipes/dependencies/libtiff/test_package/conanfile.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import os
2-
31
from conan import ConanFile
42
from conan.tools.build import can_run
53
from conan.tools.cmake import CMake, cmake_layout
4+
import os
65

76

87
class TestPackageConan(ConanFile):

pyproject.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ requires = [
44
"setuptools>=64",
55
"wheel",
66
"conan==2.4.0",
7-
"cmake>=3.25",
87
"numpy>=1.21.2,<2.3.0",
98
]
109

0 commit comments

Comments
 (0)