mirror of
https://github.com/conan-io/conan-center-index.git
synced 2025-04-30 15:56:41 +00:00
Compare commits
9 Commits
27425987f9
...
8516990ab7
Author | SHA1 | Date | |
---|---|---|---|
8516990ab7 | |||
84266febfc | |||
edeb46bd20 | |||
a50c578373 | |||
4f1d3ab21f | |||
c0ae89ec54 | |||
960a93beb1 | |||
7fe98a7861 | |||
01559d353b |
@ -1,4 +1,7 @@
|
||||
sources:
|
||||
"1.0.2":
|
||||
url: "https://github.com/furfurylic/commata/archive/refs/tags/v1.0.2.tar.gz"
|
||||
sha256: "55999ba71e167fa05055069a1e02e79b4ce6b9c1c98f5c0b64db93b5fcec8f1a"
|
||||
"1.0.1":
|
||||
url: "https://github.com/furfurylic/commata/archive/refs/tags/v1.0.1.tar.gz"
|
||||
sha256: "b6e91ede0ec8b7c69ced1e243eba204717e05fcd9ae26163a54425ca800124ef"
|
||||
|
@ -1,4 +1,6 @@
|
||||
versions:
|
||||
"1.0.2":
|
||||
folder: all
|
||||
"1.0.1":
|
||||
folder: all
|
||||
"1.0.0":
|
||||
|
@ -1,4 +1,7 @@
|
||||
sources:
|
||||
"1.4.1":
|
||||
url: "https://github.com/fltk/fltk/archive/refs/tags/release-1.4.1.tar.gz"
|
||||
sha256: "26d3e521cbf3498f122fa86f6e45fc33b84135f9eb2125f6366ef09e8eae8c91"
|
||||
"1.3.9":
|
||||
url: "https://github.com/fltk/fltk/archive/refs/tags/release-1.3.9.tar.gz"
|
||||
sha256: "f30661851a61f1931eaaceb9ef4005584c85cb07fd7ffc38a645172b8e4eb3df"
|
||||
|
@ -87,29 +87,46 @@ class FltkConan(ConanFile):
|
||||
self.requires("xorg/system")
|
||||
if self.options.with_xft:
|
||||
self.requires("libxft/2.3.8")
|
||||
if Version(self.version) >= "1.4.0":
|
||||
self.requires("gtk/system", options={"version": "3"})
|
||||
self.requires("wayland/1.22.0")
|
||||
self.requires("xkbcommon/1.6.0")
|
||||
self.requires("dbus/1.15.8")
|
||||
|
||||
def source(self):
|
||||
get(self, **self.conan_data["sources"][self.version], strip_root=True)
|
||||
|
||||
def generate(self):
|
||||
tc = CMakeToolchain(self)
|
||||
tc.variables["OPTION_BUILD_SHARED_LIBS"] = self.options.shared
|
||||
tc.variables["FLTK_BUILD_TEST"] = False
|
||||
tc.variables["FLTK_BUILD_EXAMPLES"] = False
|
||||
tc.variables["OPTION_USE_GL"] = self.options.with_gl
|
||||
tc.variables["OPTION_USE_THREADS"] = self.options.with_threads
|
||||
tc.variables["OPTION_BUILD_HTML_DOCUMENTATION"] = False
|
||||
tc.variables["OPTION_BUILD_PDF_DOCUMENTATION"] = False
|
||||
tc.variables["OPTION_USE_XFT"] = self.options.with_xft
|
||||
if self.options.abi_version:
|
||||
tc.variables["OPTION_ABI_VERSION"] = self.options.abi_version
|
||||
tc.variables["OPTION_USE_SYSTEM_LIBJPEG"] = True
|
||||
tc.variables["OPTION_USE_SYSTEM_ZLIB"] = True
|
||||
tc.variables["OPTION_USE_SYSTEM_LIBPNG"] = True
|
||||
if Version(self.version) >= "1.3.9":
|
||||
if self._is_cl_like:
|
||||
tc.variables["FLTK_MSVC_RUNTIME_DLL"] = not self._is_cl_like_static_runtime
|
||||
|
||||
if Version(self.version) < "1.4.0":
|
||||
tc.variables["OPTION_BUILD_SHARED_LIBS"] = self.options.shared
|
||||
tc.variables["OPTION_USE_GL"] = self.options.with_gl
|
||||
tc.variables["OPTION_USE_THREADS"] = self.options.with_threads
|
||||
tc.variables["OPTION_BUILD_HTML_DOCUMENTATION"] = False
|
||||
tc.variables["OPTION_BUILD_PDF_DOCUMENTATION"] = False
|
||||
tc.variables["OPTION_USE_XFT"] = self.options.with_xft
|
||||
if self.options.abi_version:
|
||||
tc.variables["OPTION_ABI_VERSION"] = self.options.abi_version
|
||||
tc.variables["OPTION_USE_SYSTEM_LIBJPEG"] = True
|
||||
tc.variables["OPTION_USE_SYSTEM_ZLIB"] = True
|
||||
tc.variables["OPTION_USE_SYSTEM_LIBPNG"] = True
|
||||
else:
|
||||
tc.variables["FLTK_BUILD_SHARED_LIBS"] = self.options.shared
|
||||
tc.variables["FLTK_BUILD_GL"] = self.options.with_gl
|
||||
tc.variables["FLTK_USE_PTHREADS"] = self.options.with_threads
|
||||
tc.variables["FLTK_BUILD_HTML_DOCS"] = False
|
||||
tc.variables["FLTK_BUILD_PDF_DOCS"] = False
|
||||
tc.variables["FLTK_USE_XFT"] = self.options.with_xft
|
||||
if self.options.abi_version:
|
||||
tc.variables["FLTK_ABI_VERSION"] = self.options.abi_version
|
||||
tc.variables["FLTK_USE_SYSTEM_LIBJPEG"] = True
|
||||
tc.variables["FLTK_USE_SYSTEM_ZLIB"] = True
|
||||
tc.variables["FLTK_USE_SYSTEM_LIBPNG"] = True
|
||||
tc.variables["FLTK_BUILD_FLUID"] = False
|
||||
if Version(self.version) >= "1.3.9" and self._is_cl_like:
|
||||
tc.variables["FLTK_MSVC_RUNTIME_DLL"] = not self._is_cl_like_static_runtime
|
||||
tc.generate()
|
||||
tc = CMakeDeps(self)
|
||||
tc.generate()
|
||||
@ -154,7 +171,5 @@ class FltkConan(ConanFile):
|
||||
self.cpp_info.system_libs.append("gdiplus")
|
||||
if self.options.with_gl:
|
||||
self.cpp_info.system_libs.append("opengl32")
|
||||
|
||||
# TODO: to remove in conan v2 once legacy generators removed
|
||||
self.cpp_info.names["cmake_find_package"] = "fltk"
|
||||
self.cpp_info.names["cmake_find_package_multi"] = "fltk"
|
||||
if Version(self.version) >= "1.4.0":
|
||||
self.cpp_info.system_libs.append("ws2_32")
|
||||
|
@ -1,4 +1,6 @@
|
||||
versions:
|
||||
"1.4.1":
|
||||
folder: "all"
|
||||
"1.3.9":
|
||||
folder: "all"
|
||||
"1.3.8":
|
||||
|
@ -1,4 +1,7 @@
|
||||
sources:
|
||||
"4.4.3":
|
||||
url: "https://github.com/stephenberry/glaze/archive/v4.4.3.tar.gz"
|
||||
sha256: "d0dd03f156f95860bf9c2957da0704ee0f7651e21089ff34e3d26fa0190e8684"
|
||||
"4.3.1":
|
||||
url: "https://github.com/stephenberry/glaze/archive/v4.3.1.tar.gz"
|
||||
sha256: "934b16d0a00dfc2b06bc2920a6444b8a6a34edb4f0fe872f8ad7a044518a37e3"
|
||||
|
@ -1,4 +1,6 @@
|
||||
versions:
|
||||
"4.4.3":
|
||||
folder: all
|
||||
"4.3.1":
|
||||
folder: all
|
||||
"4.0.1":
|
||||
|
@ -1,4 +1,7 @@
|
||||
sources:
|
||||
"1.2.0":
|
||||
url: "https://github.com/danielaparker/jsoncons/archive/refs/tags/v1.2.0.tar.gz"
|
||||
sha256: "3bdc0c8ceba1943b5deb889559911ebe97377971453a11227ed0a51a05e5d5d8"
|
||||
"1.0.0":
|
||||
url: "https://github.com/danielaparker/jsoncons/archive/refs/tags/v1.0.0.tar.gz"
|
||||
sha256: "5b602e131761a3eb0fc85043a67e8006f04fa0ce2f2012aeca48371cd99ec85f"
|
||||
@ -11,30 +14,3 @@ sources:
|
||||
"0.176.0":
|
||||
url: "https://github.com/danielaparker/jsoncons/archive/refs/tags/v0.176.0.tar.gz"
|
||||
sha256: "2eb50b5cbe204265fef96c052511ed6e3b8808935c6e2c8d28e0aba7b08fda33"
|
||||
"0.175.0":
|
||||
url: "https://github.com/danielaparker/jsoncons/archive/refs/tags/v0.175.0.tar.gz"
|
||||
sha256: "7f8a04cfd25a73d2ba2283be8eb98a39780df1e90600d8c75ddf19d52bd2c2c9"
|
||||
"0.174.0":
|
||||
url: "https://github.com/danielaparker/jsoncons/archive/refs/tags/v0.174.0.tar.gz"
|
||||
sha256: "60507721a26c752c71fbb228568f7944ea3fd287e9b179a9128ca32d7ddbb386"
|
||||
"0.173.4":
|
||||
url: "https://github.com/danielaparker/jsoncons/archive/refs/tags/v0.173.4.tar.gz"
|
||||
sha256: "3e3525325c88b33f15af2e1f3cf7a1893a49e47aa787a2df723a098b3a4b20b1"
|
||||
"0.173.3":
|
||||
url: "https://github.com/danielaparker/jsoncons/archive/refs/tags/v0.173.3.tar.gz"
|
||||
sha256: "2b5796e8f681ce9253fb5863d695ecb1cebc7092596af01ce4fca0e5e245b7be"
|
||||
"0.173.2":
|
||||
url: "https://github.com/danielaparker/jsoncons/archive/refs/tags/v0.173.2.tar.gz"
|
||||
sha256: "c689e9275fe428abf2914e4588321ed0fa756cce6448af94fbd625eb0a618a57"
|
||||
"0.173.0":
|
||||
url: "https://github.com/danielaparker/jsoncons/archive/refs/tags/v0.173.0.tar.gz"
|
||||
sha256: "61abb5e4fbdb3ef7601b4fdc263bc806785609c47b4d7e81f8c3110bd53a9282"
|
||||
"0.172.1":
|
||||
url: "https://github.com/danielaparker/jsoncons/archive/refs/tags/v0.172.1.tar.gz"
|
||||
sha256: "710ac7656373a118cee4ad10ecb2225d331ca5b4706a4add3a2b482b7fceef1f"
|
||||
"0.172.0":
|
||||
url: "https://github.com/danielaparker/jsoncons/archive/refs/tags/v0.172.0.tar.gz"
|
||||
sha256: "a0b9f8c9afcfc30993bc9122a659e3790351b621c354e5dee09dd7c53665df14"
|
||||
"0.171.1":
|
||||
url: "https://github.com/danielaparker/jsoncons/archive/refs/tags/v0.171.1.tar.gz"
|
||||
sha256: "e84d71bcf7c78f21de8bbd88a8da6f6afa458f562f6b846ef51f1aa5697ad904"
|
||||
|
@ -1,12 +1,10 @@
|
||||
from conan import ConanFile
|
||||
from conan.errors import ConanInvalidConfiguration
|
||||
from conan.tools.files import get, copy
|
||||
from conan.tools.layout import basic_layout
|
||||
from conan.tools.build import check_min_cppstd
|
||||
from conan.tools.scm import Version
|
||||
import os
|
||||
|
||||
required_conan_version = ">=1.50.0"
|
||||
required_conan_version = ">=2.0"
|
||||
|
||||
|
||||
class JsonconsConan(ConanFile):
|
||||
@ -26,21 +24,6 @@ class JsonconsConan(ConanFile):
|
||||
settings = "os", "arch", "compiler", "build_type"
|
||||
no_copy_source = True
|
||||
|
||||
@property
|
||||
def _min_cppstd(self):
|
||||
return "11" if Version(self.version) < "0.172.0" else "14"
|
||||
|
||||
@property
|
||||
def _compilers_minimum_version(self):
|
||||
return {
|
||||
"14": {
|
||||
"gcc": "6",
|
||||
"clang": "5",
|
||||
"apple-clang": "10",
|
||||
"Visual Studio": "15",
|
||||
"msvc": "191",
|
||||
},
|
||||
}.get(self._min_cppstd, {})
|
||||
|
||||
def layout(self):
|
||||
basic_layout(self, src_folder="src")
|
||||
@ -49,13 +32,7 @@ class JsonconsConan(ConanFile):
|
||||
self.info.clear()
|
||||
|
||||
def validate(self):
|
||||
if self.settings.compiler.cppstd:
|
||||
check_min_cppstd(self, self._min_cppstd)
|
||||
minimum_version = self._compilers_minimum_version.get(str(self.settings.compiler), False)
|
||||
if minimum_version and Version(self.settings.compiler.version) < minimum_version:
|
||||
raise ConanInvalidConfiguration(
|
||||
f"{self.ref} requires C++{self._min_cppstd}, which your compiler does not support."
|
||||
)
|
||||
check_min_cppstd(self, "14")
|
||||
|
||||
def source(self):
|
||||
get(self, **self.conan_data["sources"][self.version], strip_root=True)
|
||||
@ -70,7 +47,3 @@ class JsonconsConan(ConanFile):
|
||||
|
||||
self.cpp_info.set_property("cmake_file_name", "jsoncons")
|
||||
self.cpp_info.set_property("cmake_target_name", "jsoncons")
|
||||
|
||||
# TODO: to remove in conan v2 once cmake_find_package* generators removed
|
||||
self.cpp_info.names["cmake_find_package"] = "jsoncons"
|
||||
self.cpp_info.names["cmake_find_package_multi"] = "jsoncons"
|
||||
|
@ -1,4 +1,6 @@
|
||||
versions:
|
||||
"1.2.0":
|
||||
folder: "all"
|
||||
"1.0.0":
|
||||
folder: "all"
|
||||
"0.178.0":
|
||||
@ -6,22 +8,4 @@ versions:
|
||||
"0.177.0":
|
||||
folder: "all"
|
||||
"0.176.0":
|
||||
folder: "all"
|
||||
"0.175.0":
|
||||
folder: "all"
|
||||
"0.174.0":
|
||||
folder: "all"
|
||||
"0.173.4":
|
||||
folder: "all"
|
||||
"0.173.3":
|
||||
folder: "all"
|
||||
"0.173.2":
|
||||
folder: "all"
|
||||
"0.173.0":
|
||||
folder: "all"
|
||||
"0.172.1":
|
||||
folder: "all"
|
||||
"0.172.0":
|
||||
folder: "all"
|
||||
"0.171.1":
|
||||
folder: "all"
|
||||
folder: "all"
|
@ -246,6 +246,10 @@ class OpenSceneGraphConanFile(ConanFile):
|
||||
deps = CMakeDeps(self)
|
||||
deps.set_property("freetype", "cmake_module_file_name", "Freetype")
|
||||
deps.set_property("giflib", "cmake_file_name", "GIFLIB")
|
||||
deps.set_property("libjpeg-turbo", "cmake_file_name", "JPEG")
|
||||
deps.set_property("libjpeg-turbo::jpeg", "cmake_target_name", "JPEG::JPEG")
|
||||
deps.set_property("mozjpeg", "cmake_file_name", "JPEG")
|
||||
deps.set_property("mozjpeg::libjpeg", "cmake_target_name", "JPEG::JPEG")
|
||||
deps.generate()
|
||||
|
||||
def _patch_sources(self):
|
||||
|
@ -1,4 +1,7 @@
|
||||
sources:
|
||||
"1.18.0":
|
||||
url: "https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.18.0.tar.gz"
|
||||
sha256: "b149109d5983cf8290d614654a878899a68b0c8902b64c934d06f47cd50ffe2e"
|
||||
"1.17.0":
|
||||
url: "https://github.com/open-telemetry/opentelemetry-cpp/archive/v1.17.0.tar.gz"
|
||||
sha256: "13542725463f1ea106edaef078c2276065cf3da998cb1d3dcf92630daa3f64d4"
|
||||
|
@ -216,7 +216,10 @@ class OpenTelemetryCppConan(ConanFile):
|
||||
|
||||
def build_requirements(self):
|
||||
if self._needs_proto:
|
||||
self.tool_requires("opentelemetry-proto/1.3.2")
|
||||
if Version(self.version) >= "1.18.0":
|
||||
self.tool_requires("opentelemetry-proto/1.4.0")
|
||||
else:
|
||||
self.tool_requires("opentelemetry-proto/1.3.2")
|
||||
self.tool_requires("protobuf/<host_version>")
|
||||
|
||||
if self.options.with_otlp_grpc:
|
||||
|
@ -1,4 +1,6 @@
|
||||
versions:
|
||||
"1.18.0":
|
||||
folder: all
|
||||
"1.17.0":
|
||||
folder: all
|
||||
"1.16.1":
|
||||
|
@ -1,4 +1,10 @@
|
||||
sources:
|
||||
"5.29.3":
|
||||
url: "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v5.29.3.tar.gz"
|
||||
sha256: "fe35f190d7a63533b06558915d6ee469cbee143de70891e1dd54d197b05f362a"
|
||||
"5.28.3":
|
||||
url: "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v5.28.3.tar.gz"
|
||||
sha256: "7fce939b9b7181bd0bd157360e0cc88a8cabf01ac4efe4662494f56dd955d4c1"
|
||||
"5.27.0":
|
||||
url: "https://github.com/protocolbuffers/protobuf/archive/refs/tags/v5.27.0.tar.gz"
|
||||
sha256: "1611a03e550c27c526bde1da544c94f7aa65c10687bbc8e570537dfa94069e1a"
|
||||
@ -23,6 +29,85 @@ patches:
|
||||
patch_type: "bugfix"
|
||||
patch_source: "https://github.com/protocolbuffers/protobuf/pull/10103"
|
||||
absl_deps:
|
||||
# reference: https://github.com/protocolbuffers/protobuf/blob/main/cmake/abseil-cpp.cmake
|
||||
"5.29.3":
|
||||
- absl_absl_check
|
||||
- absl_absl_log
|
||||
- absl_algorithm
|
||||
- absl_base
|
||||
- absl_bind_front
|
||||
- absl_bits
|
||||
- absl_btree
|
||||
- absl_cleanup
|
||||
- absl_cord
|
||||
- absl_core_headers
|
||||
- absl_debugging
|
||||
- absl_die_if_null
|
||||
- absl_dynamic_annotations
|
||||
- absl_flags
|
||||
- absl_flat_hash_map
|
||||
- absl_flat_hash_set
|
||||
- absl_function_ref
|
||||
- absl_hash
|
||||
- absl_if_constexpr
|
||||
- absl_layout
|
||||
- absl_log_initialize
|
||||
- absl_log_globals
|
||||
- absl_log_severity
|
||||
- absl_memory
|
||||
- absl_node_hash_map
|
||||
- absl_node_hash_set
|
||||
- absl_optional
|
||||
- absl_random_distributions
|
||||
- absl_random_random
|
||||
- absl_span
|
||||
- absl_status
|
||||
- absl_statusor
|
||||
- absl_strings
|
||||
- absl_synchronization
|
||||
- absl_time
|
||||
- absl_type_traits
|
||||
- absl_utility
|
||||
- absl_variant
|
||||
"5.28.3":
|
||||
- absl_absl_check
|
||||
- absl_absl_log
|
||||
- absl_algorithm
|
||||
- absl_base
|
||||
- absl_bind_front
|
||||
- absl_bits
|
||||
- absl_btree
|
||||
- absl_cleanup
|
||||
- absl_cord
|
||||
- absl_core_headers
|
||||
- absl_debugging
|
||||
- absl_die_if_null
|
||||
- absl_dynamic_annotations
|
||||
- absl_flags
|
||||
- absl_flat_hash_map
|
||||
- absl_flat_hash_set
|
||||
- absl_function_ref
|
||||
- absl_hash
|
||||
- absl_if_constexpr
|
||||
- absl_layout
|
||||
- absl_log_initialize
|
||||
- absl_log_globals
|
||||
- absl_log_severity
|
||||
- absl_memory
|
||||
- absl_node_hash_map
|
||||
- absl_node_hash_set
|
||||
- absl_optional
|
||||
- absl_random_distributions
|
||||
- absl_random_random
|
||||
- absl_span
|
||||
- absl_status
|
||||
- absl_statusor
|
||||
- absl_strings
|
||||
- absl_synchronization
|
||||
- absl_time
|
||||
- absl_type_traits
|
||||
- absl_utility
|
||||
- absl_variant
|
||||
"5.27.0":
|
||||
- absl_absl_check
|
||||
- absl_absl_log
|
||||
|
@ -78,7 +78,7 @@ class ProtobufConan(ConanFile):
|
||||
self.requires("zlib/[>=1.2.11 <2]")
|
||||
|
||||
if self._protobuf_release >= "22.0":
|
||||
self.requires("abseil/20240116.2", transitive_headers=True)
|
||||
self.requires("abseil/[>=20230802.1 <=20240722.0]", transitive_headers=True)
|
||||
|
||||
@property
|
||||
def _compilers_minimum_version(self):
|
||||
|
@ -1,4 +1,8 @@
|
||||
versions:
|
||||
"5.29.3":
|
||||
folder: all
|
||||
"5.28.3":
|
||||
folder: all
|
||||
"5.27.0":
|
||||
folder: all
|
||||
"4.25.3":
|
||||
|
@ -1,4 +1,7 @@
|
||||
sources:
|
||||
"4.3.0":
|
||||
url: "https://github.com/swig/swig/archive/refs/tags/v4.3.0.tar.gz"
|
||||
sha256: "f2136da1137a20dfcec795fe0d17ca1a2465d28e3b307f122526629b6b2f2294"
|
||||
"4.2.1":
|
||||
url: "https://github.com/swig/swig/archive/refs/tags/v4.2.1.tar.gz"
|
||||
sha256: "8895878b9215612e73611203dc8f5232c626e4d07ffc4532922f375518f067ca"
|
||||
@ -15,6 +18,13 @@ sources:
|
||||
url: "https://github.com/swig/swig/archive/rel-4.0.1.tar.gz"
|
||||
sha256: "2eaf6fb89d071d1be280bf995c63360b3729860c0da64948123b5d7e4cfb6cb7"
|
||||
patches:
|
||||
"4.3.0":
|
||||
- patch_file: "patches/0001-4.3.0-swig-linux-library-path.patch"
|
||||
patch_type: "portability"
|
||||
patch_description: "swig -swiglib should return the correct path next to the binary even when relocated"
|
||||
- patch_file: "patches/0002-4.3.0-do-not-define-SWIG_LIB_WIN_UNIX.patch"
|
||||
patch_type: "portability"
|
||||
patch_description: "swig -swiglib should return the correct path next to the binary even when relocated"
|
||||
"4.2.1":
|
||||
- patch_file: "patches/0001-4.2.1-swig-linux-library-path.patch"
|
||||
patch_type: "portability"
|
||||
|
@ -0,0 +1,53 @@
|
||||
diff --git a/Source/Modules/main.cxx b/Source/Modules/main.cxx
|
||||
index f68b609c9..3d1310f5d 100644
|
||||
--- a/Source/Modules/main.cxx
|
||||
+++ b/Source/Modules/main.cxx
|
||||
@@ -861,6 +861,32 @@ static void getoptions(int argc, char *argv[]) {
|
||||
|
||||
static void SWIG_exit_handler(int status);
|
||||
|
||||
+#if defined(HAVE_UNISTD_H) && !defined(_WIN32)
|
||||
+#include <libgen.h>
|
||||
+#include <unistd.h>
|
||||
+#include <dlfcn.h>
|
||||
+
|
||||
+static String *get_exe_path(void) {
|
||||
+ Dl_info info;
|
||||
+ if (dladdr("main", &info)) {
|
||||
+ char realp_buffer[PATH_MAX];
|
||||
+ char* res = NULL;
|
||||
+
|
||||
+ res = realpath(info.dli_fname, realp_buffer);
|
||||
+ if (!res) {
|
||||
+ return NewString(SWIG_LIB);
|
||||
+ }
|
||||
+
|
||||
+ const char* dir = dirname(realp_buffer);
|
||||
+ char dest_buf[PATH_MAX];
|
||||
+ strcpy(dest_buf, dir);
|
||||
+ strcat(dest_buf, "/swiglib");
|
||||
+ return NewStringWithSize(dest_buf, strlen(dest_buf));
|
||||
+ }
|
||||
+ return NewString(SWIG_LIB);
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
int SWIG_main(int argc, char *argv[], const TargetLanguageModule *tlm) {
|
||||
char *c;
|
||||
|
||||
@@ -901,12 +927,14 @@ int SWIG_main(int argc, char *argv[], const TargetLanguageModule *tlm) {
|
||||
char *p;
|
||||
if (!(GetModuleFileName(0, buf, MAX_PATH) == 0 || (p = strrchr(buf, '\\')) == 0)) {
|
||||
*(p + 1) = '\0';
|
||||
- SwigLib = NewStringf("%sLib", buf); // Native windows installation path
|
||||
+ SwigLib = NewStringf("%sswiglib", buf); // Native windows installation path
|
||||
} else {
|
||||
SwigLib = NewStringf(""); // Unexpected error
|
||||
}
|
||||
if (Len(SWIG_LIB_WIN_UNIX) > 0)
|
||||
SwigLibWinUnix = NewString(SWIG_LIB_WIN_UNIX); // Unix installation path using a drive letter (for msys/mingw)
|
||||
+#elif defined(HAVE_UNISTD_H) && !defined(_WIN32)
|
||||
+ SwigLib = get_exe_path();
|
||||
#else
|
||||
SwigLib = NewString(SWIG_LIB);
|
||||
#endif
|
@ -0,0 +1,13 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 88cc4e4cd..e8902d755 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2823,7 +2823,7 @@ case $build in
|
||||
*-*-cygwin*) SWIG_LIB_WIN_UNIX=`cygpath --mixed "$SWIG_LIB"`;;
|
||||
*) SWIG_LIB_WIN_UNIX="";;
|
||||
esac
|
||||
-AC_DEFINE_UNQUOTED(SWIG_LIB_WIN_UNIX, ["$SWIG_LIB_WIN_UNIX"], [Directory for SWIG system-independent libraries (Unix install on native Windows)])
|
||||
+AC_DEFINE_UNQUOTED(SWIG_LIB_WIN_UNIX, [""], [Directory for SWIG system-independent libraries (Unix install on native Windows)])
|
||||
|
||||
SWIG_LIB_PREINST=$ABS_SRCDIR/Lib
|
||||
AC_SUBST(SWIG_LIB_PREINST)
|
@ -1,4 +1,6 @@
|
||||
versions:
|
||||
"4.3.0":
|
||||
folder: "all"
|
||||
"4.2.1":
|
||||
folder: "all"
|
||||
"4.1.1":
|
||||
|
@ -1,4 +1,7 @@
|
||||
sources:
|
||||
"0.15.9":
|
||||
url: "https://github.com/thorvg/thorvg/archive/refs/tags/v0.15.9.tar.gz"
|
||||
sha256: "05c5424d5065f38db832c87785e3cc0e135443797a4431bdcda6807abf75d8cc"
|
||||
"0.15.4":
|
||||
url: "https://github.com/thorvg/thorvg/archive/refs/tags/v0.15.4.tar.gz"
|
||||
sha256: "3031a3e070322194fc5368419e996420f05f26ec2ec8137beca17eba5e5e8a58"
|
||||
|
@ -36,6 +36,7 @@ class ThorvgConan(ConanFile):
|
||||
"with_simd": [True, False],
|
||||
"with_examples": [True, False],
|
||||
"with_extra": [False, 'lottie_expressions'],
|
||||
"with_file": [True, False],
|
||||
}
|
||||
default_options = {
|
||||
"shared": False,
|
||||
@ -49,6 +50,7 @@ class ThorvgConan(ConanFile):
|
||||
"with_simd": False,
|
||||
"with_examples": False,
|
||||
"with_extra": 'lottie_expressions',
|
||||
"with_file": True,
|
||||
}
|
||||
# See more here: https://github.com/thorvg/thorvg/blob/main/meson_options.txt
|
||||
options_description = {
|
||||
@ -81,6 +83,8 @@ class ThorvgConan(ConanFile):
|
||||
def config_options(self):
|
||||
if self.settings.os == "Windows":
|
||||
del self.options.fPIC
|
||||
if Version(self.version) < "0.15.6":
|
||||
del self.options.with_file
|
||||
|
||||
def configure(self):
|
||||
if self.options.shared:
|
||||
@ -148,6 +152,8 @@ class ThorvgConan(ConanFile):
|
||||
tc.project_options["simd"] = bool(self.options.with_simd)
|
||||
if self.options.with_extra:
|
||||
tc.project_options["extra"] = str(self.options.with_extra)
|
||||
if "with_file" in self.options:
|
||||
tc.project_options["file"] = self.options.with_file
|
||||
tc.generate()
|
||||
tc = PkgConfigDeps(self)
|
||||
tc.generate()
|
||||
|
@ -1,4 +1,6 @@
|
||||
versions:
|
||||
"0.15.9":
|
||||
folder: all
|
||||
"0.15.4":
|
||||
folder: all
|
||||
"0.15.3":
|
||||
|
Reference in New Issue
Block a user