Skip to content

Commit 0263b9b

Browse files
Update conan profiles. pdf2htmlEX specific options not needed anymore. Use gcc-12 instead of clang-15 for build machine
1 parent 5bf3659 commit 0263b9b

6 files changed

Lines changed: 4 additions & 20 deletions

File tree

.github/conan/profiles/android-21-armv7

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include(pdf2htmlEX-config)
2-
31
{% set android_home = os.getenv("ANDROID_HOME") %}
42
{% set ndk_version = "26.3.11579264" %}
53
{% set api_level = "21" %}

.github/conan/profiles/android-21-armv8

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include(pdf2htmlEX-config)
2-
31
{% set android_home = os.getenv("ANDROID_HOME") %}
42
{% set ndk_version = "26.3.11579264" %}
53
{% set api_level = "21" %}

.github/conan/profiles/android-21-x86

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include(pdf2htmlEX-config)
2-
31
{% set android_home = os.getenv("ANDROID_HOME") %}
42
{% set ndk_version = "26.3.11579264" %}
53
{% set api_level = "21" %}

.github/conan/profiles/android-21-x86_64

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include(pdf2htmlEX-config)
2-
31
{% set android_home = os.getenv("ANDROID_HOME") %}
42
{% set ndk_version = "26.3.11579264" %}
53
{% set api_level = "21" %}

.github/conan/profiles/default

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
include(pdf2htmlEX-config)
2-
31
[settings]
42
os=Linux
53
arch=x86_64
6-
build_type=RelWithDebInfo
7-
compiler=clang
8-
compiler.version=15
4+
build_type=Release
5+
compiler=gcc
6+
compiler.version=12
97
compiler.cppstd=20
108
compiler.libcxx=libstdc++11
119

1210
[conf]
13-
tools.build:compiler_executables={'c': 'clang-15', 'cpp': 'clang++-15'}
11+
tools.build:compiler_executables={'c': 'gcc-12', 'cpp': 'g++-12'}

.github/conan/profiles/pdf2htmlEX-config

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

0 commit comments

Comments
 (0)