Skip to content

Commit 66fc35c

Browse files
Pass PDF2HTMLEX_RES_DIR, POPPLER_DATA_DIR and FONTCONFIG_RES_DIR path vars to CMake
1 parent af85e68 commit 66fc35c

4 files changed

Lines changed: 26 additions & 22 deletions

File tree

pdf2htmlEX/CMakeLists.txt

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,8 @@ function(copy_assets sourcevar dstsubdir)
3333
endif()
3434
endfunction()
3535

36-
copy_assets("pdf2htmlex_RES_DIRS_DEBUG" "pdf2htmlEX")
37-
copy_assets("pdf2htmlex_RES_DIRS_RELEASE" "pdf2htmlEX")
38-
copy_assets("pdf2htmlex_RES_DIRS_RELWITHDEBINFO" "pdf2htmlEX")
39-
copy_assets("pdf2htmlex_RES_DIRS_MINSIZEREL" "pdf2htmlEX")
36+
copy_assets("PDF2HTMLEX_RES_DIR" "pdf2htmlEX")
37+
copy_assets("POPPLER_DATA_RES_DIR" "poppler-data")
38+
copy_assets("FONTCONFIG_RES_DIR" "fontconfig")
4039

41-
copy_assets("poppler-data_RES_DIRS_DEBUG" "poppler-data")
42-
copy_assets("poppler-data_RES_DIRS_RELEASE" "poppler-data")
43-
copy_assets("poppler-data_RES_DIRS_RELWITHDEBINFO" "poppler-data")
44-
copy_assets("poppler-data_RES_DIRS_MINSIZEREL" "poppler-data")
45-
46-
copy_assets("fontconfig_RES_DIRS_DEBUG" "fontconfig")
47-
copy_assets("fontconfig_RES_DIRS_RELEASE" "fontconfig")
48-
copy_assets("fontconfig_RES_DIRS_RELWITHDEBINFO" "fontconfig")
49-
copy_assets("fontconfig_RES_DIRS_MINSIZEREL" "fontconfig")
40+
#@TODO: fontforge cidfiles

pdf2htmlEX/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ group = rootProject.group
3131
["armv7", "armv8", "x86", "x86_64"].each { arch ->
3232
tasks.named("conanInstall-" + arch) {
3333
profile.set("android-21-" + arch)
34+
conanfile.set("conanfile.py")
3435
}
3536
}
3637

pdf2htmlEX/conanfile.py

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
from conan import ConanFile
2+
from conan.tools.cmake import CMakeToolchain, CMakeDeps
3+
4+
required_conan_version = ">=2.0.6"
5+
6+
7+
class pdf2htmlEXConan(ConanFile):
8+
settings = "os", "compiler", "build_type", "arch"
9+
requires = "pdf2htmlex/0.18.8.rc1-20240814-git"
10+
11+
def generate(self):
12+
deps = CMakeDeps(self)
13+
deps.generate()
14+
tc = CMakeToolchain(self)
15+
16+
# @TODO: figure out how to use POPPLER_DATA_DIR exported by poppler-data
17+
tc.variables["POPPLER_DATA_RES_DIR"] = self.dependencies['poppler-data'].cpp_info.resdirs[0]
18+
tc.variables["PDF2HTMLEX_RES_DIR"] = self.dependencies['pdf2htmlex'].cpp_info.resdirs[0]
19+
tc.variables["FONTCONFIG_RES_DIR"] = self.dependencies['fontconfig'].cpp_info.resdirs[0]
20+
tc.generate()
21+

pdf2htmlEX/conanfile.txt

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)