Commit Graph

5749 Commits (54ca88b466b2e02a006f650ef20c364a526456ad)

Author SHA1 Message Date
Jared Mulconry 0469a5c2e4 Fixed build warnings on MSVC14 x64 in the debone process. 2016-11-19 03:45:25 +11:00
Jared Mulconry 43ef4ec715 Fixed build warnings on MSVC14 x64 in the D3MF format sources. 2016-11-19 03:34:39 +11:00
Jared Mulconry 9a323d6de3 Fixed build warnings on MSVC14 x64 in the CSM loader. 2016-11-19 03:29:47 +11:00
Jared Mulconry d16b8953b5 Fixed build warnings on MSVC14 x64 in the Collada exporter. 2016-11-19 03:24:55 +11:00
Jared Mulconry 4b6c69c4f8 Fixed an incorrect cast introduced in an earlier commit. 2016-11-19 03:17:39 +11:00
Jared Mulconry 128c27e89c Fixed build warnings on MSVC14 x64 in the Collada loader. 2016-11-19 03:16:06 +11:00
Jared Mulconry 3b63e4af54 Fixed build warnings on MSVC14 x64 in the Collada parser. 2016-11-19 02:42:51 +11:00
Jared Mulconry 2866da1262 Fixed build warnings on MSVC14 x64 in the COB format sources. 2016-11-19 02:35:30 +11:00
Jared Mulconry df6707a262 Fixed build warnings on MSVC14 x64 in the BVH format sources. 2016-11-19 02:33:58 +11:00
Jared Mulconry e4d43aa51a Fixed a bug in the AMF Importer Postprocessing where metadata would be
incorrectly recorded as having type bool for all entries.
2016-11-19 02:07:32 +11:00
Jared Mulconry 06beb50391 Fixed build warnings on MSVC14 x64 in the Blender format sources, as well as
build warnings in tests.
2016-11-19 01:54:27 +11:00
Jared Mulconry bf5fc593eb Fixed build warnings on MSVC14 x64 in the B3D format sources. 2016-11-19 01:21:59 +11:00
Kim Kulling 235010d531 Merge pull request #1070 from elect86/patch-1
Update material.h
2016-11-18 14:56:22 +01:00
Jared Mulconry a2dadbbe52 Fixed build warnings on MSVC14 x64 in the AssBin sources. 2016-11-19 00:39:11 +11:00
Jared Mulconry 6ba2dc4db3 Fixed build warnings on MSVC14 x64 in the postprocessing of AMF format. 2016-11-19 00:31:32 +11:00
Jared Mulconry 505928cc02 Fixed build warnings on MSVC14 x64 in the 3DS format sources. 2016-11-19 00:20:53 +11:00
Giuseppe Barbieri 91e4d029dc Update material.h
Fixed grammar
2016-11-18 13:08:00 +01:00
Kim Kulling cae8a172c3 Merge branch 'master' into coverity_scan 2016-11-18 11:38:45 +01:00
Kim Kulling a9c5b6f1be Ensure that filelist for assimp lib is not empty for coveralls. 2016-11-17 19:57:24 +01:00
Kim Kulling 46a022520f Remove commented code. 2016-11-17 19:11:28 +01:00
Kim Kulling 0f2ed2c449 Remove unused filter for coveralls. 2016-11-17 15:11:05 +01:00
Kim Kulling 01135855e0 Remove folder test from test coverage. 2016-11-17 14:35:21 +01:00
Kim Kulling b990e93b9f Merge pull request #1067 from assimp/coverall_support
Travis: enable coverall support.
2016-11-17 11:40:35 +01:00
Kim Kulling 9b63015626 Disable debou output for lcov call in travis config. 2016-11-17 11:17:53 +01:00
Kim Kulling 7a7f7b851b Remove deprecated boost workaround flag from travis config. 2016-11-17 11:16:42 +01:00
Kim Kulling 2fdc6a51d2 Embed coverage to readme. 2016-11-17 10:57:53 +01:00
Kim Kulling 6daa464378 Next try: use original directory root. 2016-11-17 10:23:57 +01:00
Kim Kulling 8b1f382a0e Travis config: use correct env variable to enable coveralls. 2016-11-17 10:06:50 +01:00
Kim Kulling 8bd9fadeea Check assimp.dir folder. 2016-11-16 21:43:22 +01:00
Kim Kulling c695c74a60 Much more verbose. 2016-11-16 21:35:10 +01:00
Kim Kulling 8d4633510f More verbose. 2016-11-16 21:28:20 +01:00
Kim Kulling 1dd8148e81 Make travis more verbose. 2016-11-16 21:16:50 +01:00
Kim Kulling 4d47e47815 Fix typo. 2016-11-16 20:14:54 +01:00
Kim Kulling c399981dbe Next try. 2016-11-16 20:08:04 +01:00
Kim Kulling 7307c07623 Add missing cmake mocules 2016-11-16 16:46:54 +01:00
Kim Kulling 284b755cf9 add test source to coveralls again. 2016-11-16 16:36:22 +01:00
Kim Kulling 4ac3a0af8f iEnable coverall for tests. 2016-11-16 16:19:43 +01:00
Kim Kulling 6c5e475d14 Still working on config. 2016-11-16 16:11:30 +01:00
Kim Kulling 09df4b0299 Fix travis cmake call to enable coberalls. 2016-11-16 15:54:53 +01:00
Kim Kulling e95ccee97e Test coverage only in one comp from build matrix. 2016-11-16 15:42:08 +01:00
Kim Kulling 53d6adeb53 Enable coveralls measurement 2016-11-16 12:24:55 +01:00
Kim Kulling 76794f4aa7 Enableing test coverage for unittests. 2016-11-16 12:06:21 +01:00
Kim Kulling a6c86c79f1 Travis: enable coverall support. 2016-11-16 11:39:44 +01:00
Kim Kulling a1f773c305 Merge branch 'master' of https://github.com/assimp/assimp 2016-11-14 20:34:52 +01:00
Kim Kulling 855031d37c CmakeLists: remove ugly and deprecated hack fo mingw. 2016-11-14 20:20:03 +01:00
Kim Kulling 302b8044c6 Merge pull request #1064 from snowzurfer/master
Fix obj .mtl file loading
2016-11-14 20:17:28 +01:00
Kim Kulling afad31acab Merge pull request #1066 from jaredmulconry/master
MSVC14 x64 /bigobj missing causes compile error
2016-11-14 19:02:52 +01:00
Jared Mulconry eceb61b854 Fixed a compile error on MSVC14 x64 caused by the /bigobj flag failing to be set
for the 1 and 2-suffixed versions introduced in
commit 0a25b076b8.
2016-11-14 22:52:29 +11:00
Alberto Taiuti ce4f696312 Revert "Make assimp build cherry-picked importers in CMake"
This reverts commit 70d5bb8c7b.
2016-11-12 02:10:51 +00:00
Alberto Taiuti 70d5bb8c7b Make assimp build cherry-picked importers in CMake
Modify assimp's cmake to exclude the build of all the importers
by default; the user has then to manually select the ones needed
by setting the relative option.

From the explanation as written in the CMakeLists itself:

---
This option allows to select whether to build all the importers and then
manually select which ones not to build (old behaviour), or if to
exclude all importers from build and manually select the ones to actually
build.
By default, exclude all importers and manually select which ones to use.

To have all importers excluded, simply do not set this option in the parent
CmakeLists. Then, set the option for the importer(s) needed in the parent
CMakeLists, e.g.:
   OPTION(ASSIMP_BUILD_OBJ_IMPORTER "" TRUE)

To have assimp build all the importers, set the option to true, then manually
exclude which importers you don't need, e.g.:
   OPTION(ASSIMP_BUILD_OBJ_IMPORTER "" FALSE)

NOTE: In order to use this method of exclusion, the tools build must be disabled;
their code references certain importers/exporters which would be excluded.
If you need the tools, either manually add the importers/exporters the code
references (you will see linkage errors), or just enable the build of all the
importers as explained above.
---

As mentioned there, set the main CMakeLists not to build the tools and
the tests by default, since they use certain exporters and importers
which, with this method, are not necessarily used/built.
2016-11-12 02:04:05 +00:00