8bd943abc6
Update CMakeLists.txt
2024-09-10 19:37:01 +02:00
cd0ef869e3
Kimkulling/mark blender versions as not supported ( #5370 )
...
* Cleanup defs + add deprecated macro
* Remove empty line
* Remove dead code
---------
Co-authored-by: Kim Kulling <kim.kulling@draeger.com>
2024-09-05 23:40:19 +02:00
f69e55058d
Allow usage of pugixml from a superproject ( #5752 )
...
When using CMake subprojects with an existing build of pugixml
this prevents Assimp from using its own copy.
2024-09-03 21:45:30 +02:00
11daaf79a5
Fix to judge 'multi-configuration' correctly ( #5720 )
...
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
2024-08-29 21:09:17 +02:00
d41b6b253d
Added AND condition in poly2tri dll_symbol.h to only define macros fo… ( #5693 )
...
* Added ADD condition in poly2tri dll_symbol.h to only define macros for dynamic library linking if assimp is ordered to build as DLL
* Reverted last commit to handle this issue in a better way.
* added P2T_STATIC_EXPORTS to compile definitions when building assimp as DLL
---------
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
2024-08-13 09:39:53 +02:00
0cb1693689
[USD] Integrate "tinyusdz" project ( #5628 )
...
* Squash development commits for PR
* Fix failing build on armeabi-v7a via android NDK
* Update with blendshape support
* Migrate to auto-cloning and patching tinyusdz (instead of manually copying files)
* Update to latest rendermesh-refactor branch commit
* Remove tracked file
* Update to use recent commit to "dev" branch
"rendermesh-refactor" was merged to "dev" around 9 May 2024 but merge
was not obvious from commit messages
* Add UNUSED() macro
(cherry picked from commit d89fe8f034c353cc5cc5b3ac78cd8845e006de38)
* Update tinyusdz branch
* Prevent per-ABI (x86, x86_64 etc) clone on android
* Add verbose logging cmake option
* Fix macro and patch
* Address compiler warnings
* Address compiler warnings
* Address compiler warnings
* Attempt prevent re-clone/re-patch once downloaded by any ABI build
* Disable tinyusdz clone/build by default
assimp github PR auto-CI checks clone/build the tinyusdz code, and reject PR
due to compiler warnings in the 3rd party external tinyusdz project
---------
Co-authored-by: Steve M <praktique-tellypresence@yahoo.com>
2024-07-12 13:25:35 +02:00
329fee2f0b
Disabled maybe-uninitialized error for AssetLib/Obj/ObjFileParser.cpp as it seems to be spurious. Also fixed error message for previous GCC build issue modification ( #5593 )
...
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
2024-05-26 21:07:13 +02:00
6fa4f0ff5e
Temporary fix for GCC 13+ build issue -Warray-bounds ( #5577 )
...
Added cmake code to remove warnings for array-bounds and stringop-overflow specifically for MDLLoader.cpp on GCC 13 and above.
Co-authored-by: Kim Kulling <kimkulling@users.noreply.github.com>
2024-05-19 18:51:02 +02:00
b71b8f77ee
add some ASSIMP_INSTALL checks ( #5545 )
2024-04-16 23:41:21 +02:00
b8aa68a080
CMake: Allow linking draco statically if ASSIMP_BUILD_DRACO_STATIC is set. ( #5535 )
...
* CMake: Mark draco as a private dependency since assimp does not publicly expose its interface.
* CMake: Allow linking draco statically if ASSIMP_BUILD_DRACO_STATIC is set.
2024-04-08 23:28:37 +02:00
8b9ed34eaa
Update CMakeLists.txt ( #5531 )
...
* Update CMakeLists.txt
* Update Version.cpp
* Update CMakeLists.txt
Update minimum version of cmake
* Update utVersion.cpp
Adapt unittest
2024-04-07 23:14:12 +02:00
01231d0e60
Add 2024 to copyright infos ( #5475 )
2024-02-23 22:30:05 +01:00
c08e3b4abb
Add bounds checks to the parsing utilities. ( #5421 )
...
* Add bounds checks to the parsing utilities.
* Fix merge conflicts in ACLoader.
* Fix loaders
* Fix unittest of AC-Loader.
* Remove dead code.
* Md5Parser fixes
* Fix md5-parsing
* Fix Merge conflict
* Fix merge conflicts.
* Md5: Fix warning: missing return statement.
2024-01-30 14:32:41 +01:00
46b19cc6a4
utf8 header not found
2023-11-06 16:09:53 +01:00
a521b23ab5
link to external minizip with full path
...
This let's cmake create config files that allow linking to minizip even when
in an unrelated prefix. This can happen with package managers that install
every package into their own prefix, such as [Spack](https://spack.io ).
2023-11-06 09:55:25 +01:00
aa1996e143
Mosfet80 clipper update ( #5220 )
...
* remove deprecated sprinf
* Update clipper
Updated Clipper to V6.4.2
* Fix the build
* Fix the build
* Disable hunter build
* Fix: Fix hided var.
* Fix invalid use of hunter enabled macro.
* Fix misconfig for hunter
* Disable removing contrib folder
* Update BlenderTessellator.h
* Remove Hunter-based includes
* Refactorings
* Remove final
* Update IFCCurve.cpp
* Update IFCCurve.cpp
---------
Co-authored-by: andrea <realeandrea@yahoo.it>
Co-authored-by: Kim Kulling <kim.kullingk@draeger.com>
2023-09-09 19:29:15 +02:00
e50233b2c1
Use correct PDB paths
...
The previously-specified paths were only correct for a static library
build.
I therefore fenced off that code to be specific to static library
builds.
For shared library builds, I added a generator-expression-based
alternative.
Annoyingly, this won't work with static library builds, so we don't get
the concise, reliable version in all circumstances.
I've avoided modifying any of the paths anything ends up at to avoid
breaking changes.
Resolves https://github.com/assimp/assimp/issues/4269
2023-08-23 17:19:01 +01:00
b158b716d1
Fix Memcpy-param-overlap in unzReadCurrentFile: bump zlib to 1.2.13
2023-06-14 07:41:41 +02:00
f43cfa1fba
Merge branch 'master' into msvc-clang-unused-function
2023-05-24 23:23:40 +02:00
d73595b85d
Merge branch 'master' into master
2023-05-24 21:35:26 +02:00
aed43878ef
Merge branch 'master' into FlorianBorn71-SmallAllocationFixInFBXLoader
2023-05-15 14:28:46 +02:00
e627f691a8
Merge branch 'SmallAllocationFixInFBXLoader' of https://github.com/FlorianBorn71/assimp into FlorianBorn71-SmallAllocationFixInFBXLoader
2023-05-15 09:30:57 +02:00
69145c8929
Fix librt link
2023-05-05 08:47:14 +02:00
fbf8799cb5
Fix warning related to unused-function.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-05-03 23:02:38 +08:00
92d426de2b
Remove unused -Wno-missing-noreturn.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-29 01:05:25 +08:00
51494e1b4f
Remove unused -Wno-deprecated-copy-with-user-provided-dtor.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-29 00:55:13 +08:00
cdefc9f7aa
Remove unused -Wno-deprecated-copy-with-dtor.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-29 00:43:40 +08:00
230bee2e34
Merge branch 'master' into msvc-clang-missing-variable-declarations
2023-04-26 11:15:32 +02:00
07aae9eaee
Merge branch 'master' into msvc-clang-deprecated-copy-with-dtor
2023-04-26 10:42:51 +02:00
71366fff8e
Merge branch 'master' into msvc-clang-inconsistent-missing-destructor-override
2023-04-26 09:31:55 +02:00
965ebaf78b
Merge branch 'master' into deprecated-copy-with-user-provided-dtor
2023-04-26 08:22:51 +02:00
1ecb8e9196
Merge branch 'master' into msvc-clang-missing-noreturn
2023-04-25 23:56:39 +02:00
ff17f1fe3d
Remove -Wno-missing-variable-declarations.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 23:29:03 +08:00
1b826afeda
Remove -Wno-unreachable-code-break.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 22:26:44 +08:00
116ceeca31
Remove -Wno-unreachable-code-return.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-05 07:39:12 +08:00
1733d9f795
Merge branch 'master' into msvc-clang-unreachable-code
2023-04-04 17:02:22 +02:00
17bdd5f9b5
Merge branch 'master' into msvc-clang-format-non-iso
2023-04-04 15:59:27 +02:00
d6885d4025
Merge branch 'master' into msvc-clang-nested-anon-types
2023-04-03 19:59:59 +02:00
9fba0ee31b
Merge branch 'master' into msvc-clang-deprecated-copy-with-dtor
2023-04-01 20:46:34 +02:00
dacaebc078
Remove unused -Wno-shadow-field-in-constructor.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 23:49:22 +08:00
bddb4559a1
Remove -Wno-deprecated-copy-with-dtor.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 22:46:01 +08:00
7df4efea44
Fix warning related to inconsistent-missing-destructor-override.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 21:49:38 +08:00
e36812a449
Remove unused -Wno-deprecated-copy-with-user-provided-dtor.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 19:07:13 +08:00
87c309566f
Fix warning related to missing-noreturn.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 18:46:12 +08:00
20b2f857c5
Remove -Wno-unreachable-code
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 13:07:30 +08:00
94067994cc
Fix warning related to format-non-iso.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 12:29:42 +08:00
6b54761310
Fix warning related to nested-anon-types.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 10:30:10 +08:00
85b470a3ee
Merge branch 'master' into clang-cl-15.0.1-support
2023-03-29 21:20:25 +02:00
2acfc125c3
Refactoring: Make GeoUtils reusable
2023-03-14 20:03:14 +01:00
a0c29202be
Add build options to fix issues with clang 15.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-03-02 21:12:35 +08:00
Kim Kulling
Tobias Rittig, Ph.D.
OGAWA KenIchi
mkuritsu
Steve M
Daniel Simon
Zeun
Alex Rønne Petersen
Tárcio Vinícius
Martin Aumüller
AnyOldName3
Alex
Kim Kulling
Mathieu Westphal
Jackie9527
Kim Kulling