Skip to content

Commit 95637c0

Browse files
author
turtlebrowser-bot
committed
schedule : Commit by patricia-gallardo with SHA e6d80bc4566607fc4966c29a15bdc64c4f674ac7 on refs/heads/master
1 parent f4dff7b commit 95637c0

File tree

10 files changed

+28
-14
lines changed

10 files changed

+28
-14
lines changed

.conan/data/sqlite3/3.31.0/_/_/export/conanfile.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,14 +177,19 @@ def package_info(self):
177177
self.cpp_info.components["sqlite"].names["cmake_find_package_multi"] = "SQLite3"
178178
self.cpp_info.components["sqlite"].builddirs.append(self._module_subfolder)
179179
self.cpp_info.components["sqlite"].build_modules["cmake_find_package"] = [self._module_file_rel_path]
180-
self.cpp_info.components["sqlite"].libs = tools.collect_libs(self)
180+
self.cpp_info.components["sqlite"].libs = ["sqlite3"]
181+
if self.options.omit_load_extension:
182+
self.cpp_info.components["sqlite"].defines.append("SQLITE_OMIT_LOAD_EXTENSION")
181183
if self.settings.os in ["Linux", "FreeBSD"]:
182184
if self.options.threadsafe:
183185
self.cpp_info.components["sqlite"].system_libs.append("pthread")
184186
if not self.options.omit_load_extension:
185187
self.cpp_info.components["sqlite"].system_libs.append("dl")
186188
if self.options.enable_fts5 or self.options.get_safe("enable_math_functions"):
187189
self.cpp_info.components["sqlite"].system_libs.append("m")
190+
elif self.settings.os == "Windows":
191+
if self.options.shared:
192+
self.cpp_info.components["sqlite"].defines.append("SQLITE_API=__declspec(dllimport)")
188193

189194
if self.options.build_executable:
190195
bin_path = os.path.join(self.package_folder, "bin")
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1625475216
1+
1633482125
22
conandata.yml: dd8bb984234c6573be7e06a34f50d377
3-
conanfile.py: fc12e9f22a41349d8d7a35ecce470892
4-
export_source/CMakeLists.txt: 47abdabcfbf5f4f0e26afcd9c7d6fc85
3+
conanfile.py: a0913a82d10d3265a9fabcb0db295904
4+
export_source/CMakeLists.txt: 8cf3fc20569a4b6714d3eac5542844e7
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"recipe": {"revision": "0", "remote": "conancenter", "properties": {}, "checksums": {"conanmanifest.txt": {"md5": "63229d34452ba9d92aa4a87de99d0d38", "sha1": "6ba8707ea215555fa0e04d662eaaf90f0fc5e724"}, "conanfile.py": {"md5": "fc12e9f22a41349d8d7a35ecce470892", "sha1": "a6734825ec0274aa98bec8eb501c15e8bb59d781"}, "conan_export.tgz": {"md5": "8d38fb58040734565e05987c234cc04c", "sha1": "5289a78eaae37162f3e7eed1b769195b3f519075"}}}, "packages": {"8ff459f4b248c0e0564ec4e80e52b8d1aca419ce": {"revision": "0", "recipe_revision": "0", "remote": "conancenter", "properties": {}, "checksums": {"conanmanifest.txt": {"md5": "864013b4faa07ebeefa82de537ac1614", "sha1": "aa520b03b70a997f6de33e94ae69ed76511d93e1"}, "conaninfo.txt": {"md5": "e9d1e7420c1b2c37cbc29bf1bd967ad4", "sha1": "e720641373d1ce6982dfe6e3bc4815718781b347"}, "conan_package.tgz": {"md5": "311eea19c5a1a1f12649e4a6c086b113", "sha1": "0ad67962cfc1abca4736f2e7fa62576b52570aef"}}}}}
1+
{"recipe": {"revision": "0", "remote": "conancenter", "properties": {}, "checksums": {"conanmanifest.txt": {"md5": "e750e1fa0e7a67027fc712f998b10c80", "sha1": "ecfbdec286f36bd8e1b30b757d2e45f550d872aa"}, "conanfile.py": {"md5": "a0913a82d10d3265a9fabcb0db295904", "sha1": "a275d83c4a600d5d8278f830597943a54bffab53"}, "conan_export.tgz": {"md5": "8d38fb58040734565e05987c234cc04c", "sha1": "5289a78eaae37162f3e7eed1b769195b3f519075"}}}, "packages": {"8ff459f4b248c0e0564ec4e80e52b8d1aca419ce": {"revision": "0", "recipe_revision": "0", "remote": "conancenter", "properties": {}, "checksums": {"conanmanifest.txt": {"md5": "326f7ab252aafd8d1faf7f2de4e8aca7", "sha1": "ff34bb3367071122acba6e16db25c89d37ea3e1a"}, "conaninfo.txt": {"md5": "c1daf8bc1544ca5c8c9436883d5f8ece", "sha1": "f97c26040ac19bd6b7c3c4b1891f7e8c7e6b16e1"}, "conan_package.tgz": {"md5": "5bff49eb6756dfcc71794bb9511c880a", "sha1": "ffc792b0d6f1a0d808b327d9e8ba48d9c27bfcb4"}}}}}

.conan/data/sqlite3/3.31.0/_/_/package/8ff459f4b248c0e0564ec4e80e52b8d1aca419ce/conaninfo.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
use_alloca=False
6868

6969
[recipe_hash]
70-
0b04477f586452ab1bf394a3e0b63cf4
70+
1c5a63f581838fa137673d2793a7e383
7171

7272
[env]
7373

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
1625475751
2-
bin/sqlite3: bbf329d681463f26810236aa94e4a544
3-
conaninfo.txt: e9d1e7420c1b2c37cbc29bf1bd967ad4
1+
1633482973
2+
bin/sqlite3: e602374f11eec116a8511cae91d88c2b
3+
conaninfo.txt: c1daf8bc1544ca5c8c9436883d5f8ece
44
include/sqlite3.h: c69b4d8c1de015d4c41f229e39175d4a
55
include/sqlite3ext.h: 691c47b3c10a6b0faf039073e388b223
66
lib/cmake/conan-official-sqlite3-variables.cmake: 46c87924e6773d3e7458bce4657a8227
7-
lib/libsqlite3.a: 1ab2f52df2039405a51070c3cd902a83
7+
lib/libsqlite3.a: 01c0118dadd1f3116d8b1f075135d9a6
88
licenses/LICENSE: 1b97b38474e8cb1655592e063a1774cc

.conan/settings.yml.new

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ arch_build: [x86, x86_64, ppc32be, ppc32, ppc64le, ppc64, armv5el, armv5hf, armv
66
# Only for building cross compilation tools, 'os_target/arch_target' is the system for
77
# which the tools generate code
88
os_target: [Windows, Linux, Macos, Android, iOS, watchOS, tvOS, FreeBSD, SunOS, AIX, Arduino, Neutrino]
9-
arch_target: [x86, x86_64, ppc32be, ppc32, ppc64le, ppc64, armv5el, armv5hf, armv6, armv7, armv7hf, armv7s, armv7k, armv8, armv8_32, armv8.3, sparc, sparcv9, mips, mips64, avr, s390, s390x, asm.js, wasm, sh4le, e2k-v2, e2k-v3, e2k-v4, e2k-v5, e2k-v6, e2k-v7]
9+
arch_target: [x86, x86_64, ppc32be, ppc32, ppc64le, ppc64, armv5el, armv5hf, armv6, armv7, armv7hf, armv7s, armv7k, armv8, armv8_32, armv8.3, sparc, sparcv9, mips, mips64, avr, s390, s390x, asm.js, wasm, sh4le, e2k-v2, e2k-v3, e2k-v4, e2k-v5, e2k-v6, e2k-v7, xtensalx6, xtensalx106]
1010

1111
# Rest of the settings are "host" settings:
1212
# - For native building/cross building: Where the library/program will run.
@@ -43,7 +43,7 @@ os:
4343
Emscripten:
4444
Neutrino:
4545
version: ["6.4", "6.5", "6.6", "7.0", "7.1"]
46-
arch: [x86, x86_64, ppc32be, ppc32, ppc64le, ppc64, armv4, armv4i, armv5el, armv5hf, armv6, armv7, armv7hf, armv7s, armv7k, armv8, armv8_32, armv8.3, sparc, sparcv9, mips, mips64, avr, s390, s390x, asm.js, wasm, sh4le, e2k-v2, e2k-v3, e2k-v4, e2k-v5, e2k-v6, e2k-v7]
46+
arch: [x86, x86_64, ppc32be, ppc32, ppc64le, ppc64, armv4, armv4i, armv5el, armv5hf, armv6, armv7, armv7hf, armv7s, armv7k, armv8, armv8_32, armv8.3, sparc, sparcv9, mips, mips64, avr, s390, s390x, asm.js, wasm, sh4le, e2k-v2, e2k-v3, e2k-v4, e2k-v5, e2k-v6, e2k-v7, xtensalx6, xtensalx106]
4747
compiler:
4848
sun-cc:
4949
version: ["5.10", "5.11", "5.12", "5.13", "5.14", "5.15"]
@@ -92,6 +92,7 @@ compiler:
9292
cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20]
9393
intel:
9494
version: ["11", "12", "13", "14", "15", "16", "17", "18", "19", "19.1"]
95+
update: [None, ANY]
9596
base:
9697
gcc:
9798
<<: *gcc
@@ -101,6 +102,14 @@ compiler:
101102
<<: *visual_studio
102103
apple-clang:
103104
<<: *apple_clang
105+
intel-cc:
106+
version: ["2021.1", "2021.2", "2021.3"]
107+
update: [None, ANY]
108+
mode: ["icx", "classic", "dpcpp"]
109+
libcxx: [None, libstdc++, libstdc++11, libc++]
110+
cppstd: [None, 98, gnu98, 03, gnu03, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23]
111+
runtime: [None, static, dynamic]
112+
runtime_type: [None, Debug, Release]
104113
qcc:
105114
version: ["4.4", "5.4", "8.3"]
106115
libcxx: [cxx, gpp, cpp, cpp-ne, accp, acpp-ne, ecpp, ecpp-ne]
@@ -116,4 +125,4 @@ compiler:
116125
build_type: [None, Debug, Release, RelWithDebInfo, MinSizeRel]
117126

118127

119-
cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23] # Deprecated, use compiler.cppstd
128+
cppstd: [None, 98, gnu98, 11, gnu11, 14, gnu14, 17, gnu17, 20, gnu20, 23, gnu23] # Deprecated, use compiler.cppstd

.conan/version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.40.3
1+
1.41.0

0 commit comments

Comments
 (0)