v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,216 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

213 Commits (39c84931ba1c6422fca92304ad1515cc74e9eac7)

Author SHA1 Message Date
Pierre Moreau 8334bb579c Hide commit signature information when fetching commit hash 
If someone configures git to always show a commit’s signing information,
this breaks the definition of GitVersion in revision.h:

```
#ifndef ASSIMP_REVISION_H_INC
#define ASSIMP_REVISION_H_INC

#define GitVersion 0xgpg: Signature faite le Fri 15 Jun 2018 20:39:53 CEST
gpg:                avec la clef RSA 4AEE18F83AFDEB23
gpg: Impossible de vérifier la signature : Pas de clef publique
878b4b2c
#define GitBranch "master"

#endif // ASSIMP_REVISION_H_INC
```

This can be avoided by passing the `--no-show-signature` to the `git
log` command for retrieving the hash.
 2018-06-16 10:25:43 +02:00
smalcom 67eff10d8f [*] qt_assimp_viewer can be built with Qt4 or Qt5. 
[F] Working in doule precision.
 2018-05-25 21:19:06 +03:00
Jeroen Bollen 2d6782cc9f
Changed 'souces' to 'sources'. 
There was a typo in the `CMakeLists.txt` where if zlib was not found, it would say "Compiling from souces" instead of "Compiling from sources". Added a 'r' to fix the typo.
 2018-04-24 16:44:22 +02:00
kimkulling f2833539d7 closes https://github.com/assimp/assimp/issues/1784: change so.name to keep track of the minor version of the lib. 2018-04-19 08:52:21 +02:00
Kim Kulling 676e1c9565 Cmake: adapt cmake script for VS2017 2018-03-31 19:12:53 +02:00
Kim Kulling 417c4fcb45 Cmake: remove dead code. 2018-03-31 18:53:00 +02:00
Kim Kulling dbf32abfb2 Build: use c++11 in openddl-parser as well. 2018-03-31 18:51:31 +02:00
Kim Kulling 349d877899
Update CMakeLists.txt 
Remove dead code.
 2018-03-22 21:28:52 +01:00
Kim Kulling 6c21a30958 closes https://github.com/assimp/assimp/issues/1850: remove buggy setup in cmake. 2018-03-22 20:07:47 +01:00
Marco Di Benedetto 59ea3b6c85 fixed android zlib compile error. 2018-02-09 16:02:27 +01:00
Marco Di Benedetto affedc139e Merge https://github.com/assimp/assimp 2018-02-09 15:54:34 +01:00
Kim Kulling b049933d2f update license dates. 2018-01-28 19:42:05 +01:00
Kim Kulling 98325ee95d closes https://github.com/assimp/assimp/issues/1743: introduce /bigobj compile flag. 2018-01-27 09:20:22 +01:00
Marco Di Benedetto d33cc8ac5a Merge branch 'master' of https://github.com/assimp/assimp 2018-01-10 17:36:43 +01:00
Kim Kulling c66c7d7ae6 remove ctest to make workspace more readable. 2018-01-03 17:22:07 +01:00
Kim Kulling 65d29c5420
Update CMakeLists.txt 
Update version
 2017-12-11 13:22:20 +01:00
Mika Rautio 4fb5038fb1 Add support for building Mac OS X Framework bundles 2017-11-20 00:10:05 +02:00
Kim Kulling a8e65a1e8a Fix android build. 2017-11-18 18:32:16 +01:00
Kim Kulling c15c96ac76 CMake: use define for D_FILE_OFFSET_BITS only for not-android systems. 2017-11-14 20:11:40 +01:00
Andrea Baldacci, Ph.D 87ac6fbfd9
Update CMakeLists.txt 2017-10-31 02:05:01 +01:00
Turo Lamminen 6efe4e2841 CMake: Add support for Undefined Behavior sanitizer 2017-10-14 18:46:19 +03:00
Turo Lamminen 42142105fa CMake: Be more verbose about enabled options 2017-10-07 14:59:12 +03:00
Turo Lamminen d28e88feb7 CMake: Remove OpenMP stuff, it's unused and breaks Travis clang build 2017-10-06 18:22:58 +03:00
Kim Kulling c1f93a69ae Revert "WIP: Enable Travis clang build" 2017-10-06 15:42:05 +02:00
Turo Lamminen 452885672e CMake: Remove OpenMP stuff, it's unused and breaks Travis clang build 2017-10-05 10:45:40 +03:00
Kim Kulling cbca8f574e Merge pull request #1432 from turol/asan 
Asan
 2017-10-04 16:12:44 +02:00
Turo Lamminen b5db7d3649 Disable warning 4351 on MSVC 2013 2017-10-02 13:27:11 +03:00
Turo Lamminen 799f0a3ac8 Fix warnings-as-errors flag on MSVC 2017-10-02 11:40:57 +03:00
Turo Lamminen 4652b66bb5 Add AddressSanitizer option to CMake 2017-10-02 10:54:59 +03:00
Kim Kulling c202d43d8f Merge pull request #1466 from jaredmulconry/issue_1330 
Eliminated warnings when building the project with clang
 2017-10-01 20:03:30 +02:00
Turo Lamminen 77ce6e562d Fix CMAKE option name 2017-09-30 16:46:02 +03:00
Jared Mulconry a9e8836271 Added -fPIC flag to C compilers for GCC and clang. Removed -pedantic flag from some compilers. 2017-09-30 23:28:02 +10:00
Turo Lamminen f2e2f74d73 Add CMake flag to treat warnings as errors 2017-09-15 12:32:34 +03:00
Kim Kulling afd6c4d57d Revert "Asan" 2017-09-13 21:40:44 +02:00
Turo Lamminen 190f034e38 Add AddressSanitizer option to CMake 2017-09-12 18:57:44 +03:00
Minmin Gong b26fea4cf5 Fix compiling problems under VS2017.3. 
1. WordIterator's operator== and operator!= must take const WordIterator& as parameter type.
2. OpenMP doesn't work with new two phase lookups. Need to disable twoPhase.
 2017-08-14 21:51:59 -07:00
Kim Kulling 232954c15e cmake cleanup. 2017-07-31 14:25:00 +02:00
7557fdbb72 Fix install for builds with MSVC compiler and NMake. 
The CMake variable "MSVC" and the related versioned variables indicate that the
Visual Studio compiler is used but when using that compiler and the "NMake
Makefiles JOM" build generator the files it tried to install weren't in the
expected Debug folder.
 2017-07-29 07:45:25 -04:00
Kim Kulling 3fe8c72f5d new release: update to 4.0.1. 2017-07-28 22:27:36 +02:00
Kim Kulling 5e98898dca Update version. 2017-07-18 19:02:08 +02:00
Kim Kulling f30fd58494 fix review findings., 2017-06-28 22:08:20 +02:00
Tomas Maly 4399922ea1 fixed CMAKE_MODULE_PATH overwriting previous values 2017-06-10 20:12:12 +02:00
Kim Kulling dcc5887817 Update CMakeLists.txt 
Enable check for OpenMP-support.
 2017-06-02 11:20:48 +02:00
Kim Kulling 0a35fa0aef Update CMakeLists.txt 
Build: Make windows headers much smaller.
 2017-06-01 15:50:19 +02:00
rdb 9eb0a3f3d5 Fix error when custom CMAKE_C_FLAGS is specified 2017-05-23 15:34:02 +02:00
Kim Kulling 5289954e27 Fix review findings. 2017-05-06 20:57:17 +02:00
Kim Kulling 82e213fb7c Merge pull request #1252 from a-day-old-bagel/master 
Shouldn't the configured "config.h" file be going into the binary directory?
 2017-05-02 20:07:08 +02:00
Helio Chissini de Castro 0c4c1270ac Add missing CFLAGS -fPIC. 
This entry was missing due revert of CMAKE_POSITION_INDEPENDENT_CODE
usage. Reported by @Sailsman63
 2017-05-02 16:48:49 +02:00
Galen Cochrane 3e5e3a54b9 Merge branch 'master' of https://github.com/assimp/assimp 2017-04-29 15:10:35 -06:00
Helio Chissini de Castro 6f00ca558d Group libstdc++ entry in the compiler optionas as well 2017-04-29 08:44:58 +02:00