Commit Graph

384 Commits (9dfd40162426e05599440651935469b103747dec)

Author SHA1 Message Date
Kim Kulling 2ffa0c59eb
Switch to C++11 until gtest gets an update. 2021-12-16 19:54:40 +01:00
Kim Kulling af42d53c92
Enable C++17 and C99
- closes https://github.com/assimp/assimp/issues/4257
2021-12-16 19:41:15 +01:00
Kim Kulling 7a29147095
Fix a typo 2021-12-16 14:55:23 +01:00
Kim Kulling 983b20cda6
Update CMakeLists.txt
- tag v5.1.3
2021-12-04 20:26:29 +01:00
Robin Dousse 6819b84b8b Use adviced c++ flag to supress warning on mingw 2021-11-22 09:27:14 +01:00
Kim Kulling fc0617280e Disable m3d-export 2021-11-13 08:16:34 +01:00
Kim Kulling 4abf37ace6
Update CMakeLists.txt 2021-11-11 23:22:06 +01:00
Kim Kulling 4854978108
Disable m3d for 5.1
- closes https://github.com/assimp/assimp/issues/4126
2021-11-11 22:15:56 +01:00
Kim Kulling e206d699da
Change version to 5.1.0
- Change version for Version 5.1.0-RC1 to 5.1.0
- closes https://github.com/assimp/assimp/issues/4161
2021-11-09 23:26:20 +01:00
Madrich 9b535d1c15 Fix Double Precision errors/warnings 2021-08-31 12:59:31 +02:00
Kim Kulling a71baaeedf Enable Viewer only for VS-Builds 2021-08-24 19:22:15 +02:00
Kim Kulling f24101546b
Fix typo in path 2021-08-20 21:02:42 +02:00
kimmi 18f58947a4 CMake: move hunter cmake-scripts into cmake-modules 2021-08-20 20:42:02 +02:00
Rahul Sheth 1b37b74f9e Hunter fixes for stb_image 2021-07-07 17:01:19 -04:00
Rahul Sheth 0a5e49252d Merge remote-tracking branch 'origin/master' into HEAD 2021-07-07 16:35:29 -04:00
Kim Kulling 790203ee9d
Merge branch 'master' into improve-msvc-switches 2021-06-07 21:21:20 +02:00
Kim Kulling e6b83feb9f
Update CMakeLists.txt 2021-06-03 23:45:48 +02:00
ogjamesfranco 27135bd3e7 changed the assimp output directory vars to cached vars 2021-05-15 15:27:24 -04:00
Krishty 8ad9c937f1 enabled debug information in MSVC release build
No effect on runtime speed/size. Slightly slower link time, but debugging experience improves by a million times.

- /Zi – Store debug information in a .pdb file, not directly in the DLL/EXE
- /DEBUG:FULL – generate debug information during link
- /PDBALTPATH:%_PDB% – do not store the file system path of the .pdb, just the filename and hash (no disclose paths on distribution)
- /OPT:REF /OPT:ICF – remove unreferenced functions and fold identical functions (this was enabled before, but requires explicit enabling if /DEBUG:FULL is specified)
2021-05-04 19:10:24 +02:00
Krishty 65a2b98b86 updated C4D importer to use the Cineware SDK
Maxon’s Melange SDK has been renamed Cineware SDK as of 21.004, and with it all namespaces and types. This commit
- makes CMake use contrib/Cineware instead of contrib/Melange;
- renames Assimp’s namespace melange to namespace cineware;
- removes useless functions and formatter references from class C4DImporter;
- removes duplicate conversion of cineware::String to aiString in the importer;
- updates comments accordingly;
- updates copyright info.
2021-05-01 18:46:23 +02:00
Elias Daler 0bd938c024 Add zlibstatic to the list of exported targets 2021-03-29 02:26:03 +03:00
Kim Kulling c669c8f1eb
Merge branch 'master' into update_copyrights 2021-02-28 12:18:41 +01:00
Kim Kulling 9e8dbd0ca5 Update copyrights to 2021. 2021-02-28 12:17:54 +01:00
Kim Kulling 21c2f8bc9c
Workaround for VS2019
- DRACO is disabled as the default
- Use ASSIMP_BUILD_DRACO=ON to reenable it
- Workaround for https://github.com/assimp/assimp/issues/3663
2021-02-27 10:01:09 +01:00
Kim Kulling 3651dd5bbc
Merge branch 'master' into ExportZLib 2021-02-19 15:51:21 +01:00
RichardTea 42d47c7f0b Fixup install rules
Explicitly build and install the draco shared library _only_
2021-02-03 11:38:20 +00:00
RichardTea 82773c29ad
Merge pull request #22 from rbsheth/issue_2195_hunter
Try adding Draco support through Hunter
2021-02-01 12:14:53 +00:00
Kim Kulling 5fbbba2fac
Merge branch 'master' into issue_2195_draco 2021-01-31 16:02:57 +01:00
Minmin Gong 9aa6ec73ba Export zlib if it's built outside 2021-01-29 20:51:09 -08:00
Rahul Sheth a0116c6e01 Need to link against correct target 2021-01-29 17:22:16 -05:00
Rahul Sheth 62c991290b Try adding Draco support through Hunter 2021-01-29 17:10:38 -05:00
Kim Kulling 79eb9ecc86 Update all minimum cmake req to 3.10 2021-01-29 21:05:46 +01:00
RichardTea efae3b83b1 Draco requires default visibility on gcc/clang 2021-01-28 10:18:12 +00:00
RichardTea f6862f9697 Disable draco on cmake prior to 3.12 2021-01-27 10:18:33 +00:00
RichardTea 0c49cddae6 Cleanup cmakelists
Don't repeat self
Add links to google draco issues
2021-01-26 18:11:05 +00:00
RichardTea 88001d1609 Disable clang/gcc warnings for Draco 2021-01-26 17:58:00 +00:00
RichardTea fe97ff6474 Draco platform libraries have different names
On Windows it's draco.dll/lib
On Linux/macOS draco_shared.dylib & draco_static.lib
2021-01-26 17:19:41 +00:00
RichardTea c917e6513f
Merge branch 'master' into issue_2195_draco 2021-01-26 16:43:46 +00:00
RichardTea 3a7d0f5656 Add Draco to cmakelists
Initial pass. Not yet used.
Add Draco library to assimp build and link
2021-01-26 15:58:14 +00:00
kimkulling 7bb13e6272 Win32-refactorings 2021-01-18 08:39:39 +01:00
JacksonM8 d0e57e2554 Remove quoted variable de-referencing as per CMP0054 2021-01-07 00:40:50 +10:30
Hugo Sales 2873d862b0
Update CMakeLists.txt 2020-12-23 15:44:37 +00:00
huiji12321 1910bbbdd9 Additional Compiler Options for mips64el 2020-12-04 16:47:43 +08:00
Kim Kulling 3fd95aff4e
Merge branch 'master' into fix/3365 2020-10-27 17:43:28 +01:00
Kim Kulling 43f7224d0c
Update CMakeLists.txt 2020-10-27 09:46:31 +01:00
Kim Kulling 56e1a80e24
Merge branch 'master' into master 2020-10-17 10:57:26 +02:00
Silvio Traversaro 3b5212067c Fix CMake config generation
Use standard CMake function to generate the CMake config files.
2020-10-14 23:55:28 +02:00
Rahul Sheth f12e6eb6f4 Update Hunter for pugixml 2020-10-12 16:30:03 -04:00
Kim Kulling 52826a03f8 remove all hunter-dependencies for pugixml. 2020-10-05 18:53:42 +02:00
kimkulling b6dde74155 adaptions to support hunter 2020-10-01 16:35:34 +02:00