Skip to content

Commit 2556eb2

Browse files
committed
fix
1 parent 89bdc32 commit 2556eb2

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

conanfile.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ class OpenDocumentCoreConan(ConanFile):
1919
"fPIC": [True, False],
2020
"with_pdf2htmlEX": [True, False],
2121
"with_wvWare": [True, False],
22-
"with_customTmpfile": [True, False],
22+
"with_tmpfile_hack": [True, False],
2323
}
2424
default_options = {
2525
"shared": False,
2626
"fPIC": True,
2727
"with_pdf2htmlEX": True,
2828
"with_wvWare": True,
29-
"with_customTmpfile": False,
29+
"with_tmpfile_hack": True,
3030
}
3131

3232
exports_sources = ["cli/*", "cmake/*", "resources/dist/*", "src/*", "CMakeLists.txt"]
@@ -37,10 +37,8 @@ def config_options(self):
3737
del self.options.with_pdf2htmlEX
3838
del self.options.with_wvWare
3939

40-
if self.settings.os == "Android":
41-
self.default_options.with_customTmpfile = True
42-
else:
43-
del self.options.with_customTmpfile
40+
if self.settings.os != "Android":
41+
del self.options.with_tmpfile_hack
4442

4543
def requirements(self):
4644
self.requires("pugixml/1.14")
@@ -57,7 +55,7 @@ def requirements(self):
5755
self.requires("cpp-httplib/0.16.3")
5856
self.requires("argon2/20190702-odr")
5957

60-
if self.options.get_safe("with_customTmpfile", False):
58+
if self.options.get_safe("with_tmpfile_hack", False):
6159
self.requires("tmpfile/3.0.6")
6260

6361
def build_requirements(self):

0 commit comments

Comments
 (0)