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
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
Kim Kulling
8f0888f7fc
diable hunter fr pugi.
2020-09-28 20:03:51 +02:00
Kim Kulling
d6892b3f58
Merge branch 'master' into pugi_xml
2020-09-25 21:00:09 +02:00
Rahul Sheth
df56a97794
Dummy commit 2 to trigger Github Actions
2020-09-03 08:41:22 -04:00
Rahul Sheth
56a3759925
Dummy commit 1
2020-09-03 08:41:08 -04:00
kimkulling
1e6a1c63ec
Remove irrxml search.
2020-09-03 11:45:43 +02:00
Rahul Sheth
5f19c8890b
Update to the latest Hunter
2020-08-27 16:51:34 -04:00
Rahul Sheth
59c8b4ed84
Move RapidJSON definitions to CMake
2020-08-27 16:51:06 -04:00
Kim Kulling
b3f85613fc
Merge branch 'master' into fix-cmake-override-output-path3
2020-08-08 10:42:36 +02:00
Kim Kulling
fbd9c9651d
fix clang detection
2020-08-08 09:06:41 +02:00
Marc-Antoine Lortie
11daed69d3
Fixed overwriting of CMake global output directory variables.
2020-08-07 16:04:39 -04:00
kimkulling
29b72fe6d4
fix cmake warning
2020-08-07 16:22:34 +02:00
kimkulling
aaea564cbe
closes https://github.com/assimp/assimp/issues/3004 : use prefix when ms_tools were found.
2020-08-07 16:14:44 +02:00
Rafał Mikrut
c60373c0ba
Merge branch 'master' into more_ubsan_flags
2020-08-03 23:17:53 +02:00
Rafał Mikrut
447805f01a
Added more undefined sanitizer flags
2020-08-03 23:12:08 +02:00
Kim Kulling
162c8be184
Merge branch 'master' into issue-3334_cl_D9025
2020-07-22 22:57:14 +02:00
MeyerFabian
13ee2306c3
build/clang-cl-windows
2020-07-20 17:04:11 +02:00
RichardTea
a4eceb7b3f
Set CMP0092 the other way
2020-07-17 12:06:52 +01:00