Update conan profiles. pdf2htmlEX-config not needed anymore

opendocument-app · Aug 21, 2024 · 9ed1196 · 9ed1196
1 parent 5927c8c
commit 9ed1196
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 20 deletions.
diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-23-armv7 b/.github/config/ubuntu-22.04/conan/profiles/android-23-armv7
@@ -1,5 +1,3 @@
-include(pdf2htmlEX-config)
-
 {% set android_home = os.getenv("ANDROID_HOME") %}
 {% set ndk_version = "26.3.11579264" %}
 {% set api_level = "23" %}

diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-23-armv8 b/.github/config/ubuntu-22.04/conan/profiles/android-23-armv8
@@ -1,5 +1,3 @@
-include(pdf2htmlEX-config)
-
 {% set android_home = os.getenv("ANDROID_HOME") %}
 {% set ndk_version = "26.3.11579264" %}
 {% set api_level = "23" %}

diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-23-x86 b/.github/config/ubuntu-22.04/conan/profiles/android-23-x86
@@ -1,5 +1,3 @@
-include(pdf2htmlEX-config)
-
 {% set android_home = os.getenv("ANDROID_HOME") %}
 {% set ndk_version = "26.3.11579264" %}
 {% set api_level = "23" %}

diff --git a/.github/config/ubuntu-22.04/conan/profiles/android-23-x86_64 b/.github/config/ubuntu-22.04/conan/profiles/android-23-x86_64
@@ -1,5 +1,3 @@
-include(pdf2htmlEX-config)
-
 {% set android_home = os.getenv("ANDROID_HOME") %}
 {% set ndk_version = "26.3.11579264" %}
 {% set api_level = "23" %}

diff --git a/.github/config/ubuntu-22.04/conan/profiles/default b/.github/config/ubuntu-22.04/conan/profiles/default
@@ -1,13 +1,11 @@
-include(pdf2htmlEX-config)
-
 [settings]
 os=Linux
 arch=x86_64
-build_type=RelWithDebInfo
-compiler=clang
-compiler.version=15
+build_type=Release
+compiler=gcc
+compiler.version=12
 compiler.cppstd=20
 compiler.libcxx=libstdc++11
 
 [conf]
-tools.build:compiler_executables={'c': 'clang-15', 'cpp': 'clang++-15'}
+tools.build:compiler_executables={'c': 'gcc-12', 'cpp': 'g++-12'}
diff --git a/.github/config/ubuntu-22.04/conan/profiles/pdf2htmlEX-config b/.github/config/ubuntu-22.04/conan/profiles/pdf2htmlEX-config