Commit Graph

281 Commits (0ff04b97695b03c0824750b0c69c44057685e93a)

Author SHA1 Message Date
Kim Kulling a7306abcfe MDC-Loader: fix a possible nullptr access. 2018-08-31 19:29:17 +02:00
Kim Kulling 5a23810d82 Introduce header-only imagelib to make install of qt-viewer simpler. 2018-08-18 11:07:12 +02:00
Kim Kulling 063ae05310
Merge branch 'master' into 2075 2018-08-07 21:30:01 +02:00
Kim Kulling 11931b85fd closes https://github.com/assimp/assimp/issues/2075: Make inject of debug postfix an option, so you can swich it off. 2018-08-07 21:22:54 +02:00
Max Qian a77887c874 Use a more accurate way of checking if the build is 64 bit 2018-07-26 08:08:07 -07:00
Kim Kulling 797446aadf
Merge branch 'master' into build-minizip-2 2018-07-10 14:34:46 +02:00
Brendan Hack 410b54d4b8 When building local zlib ensure we don't link to any system zlib or minzip. 2018-07-09 08:41:42 +10:00
Doron Adler 5b20ad3791 Fixed a mistake I Introduced in the build script where debug and shared-lib parameters were expecting a "="
Revert to default Release build type, but this time only for iOS
Do not attempt to use minizip if you are building for iOS shared dylib
Keep in mind that the "Shared" option only apply to the assimp library and not the other two built libraries
2018-07-01 14:48:20 +03:00
Doron Adler 6a45f84b73 Revert 2018-07-01 13:10:44 +03:00
Doron Adler d79a82faa2 -Og for debug 2018-06-27 13:10:41 +03:00
Doron Adler 35871b6c37 Use -g or -O3 based on debug/release 2018-06-27 13:04:49 +03:00
Doron Adler 5428fa6dd5 Norod: Managed to get it past the make file creation phase 2018-06-27 11:39:14 +03:00
Doron Adler eebf549e8e Merge branch 'master' into ios-build-script
* master:
  Fix regression on FBX importer unit test
  Check nb of faces and vertices for FBX unit test
  Update helper.py
  Update helper.py
  Solved pyassimp.errors.AssimpError in conda
  Hide commit signature information when fetching commit hash
2018-06-27 09:59:51 +03:00
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
Doron Adler 27b989fd36 Merge branch 'master' into ios-build-script
* master: (148 commits)
  Update Importer.cpp
  [-] Trace print removed.
  [F] Get return "like true" when error occured.
  [*] qt_assimp_viewer can be built with Qt4 or Qt5. [F] Working in doule precision.
  [F] List of importers can be empty.
  [F] More correct control by a mouse
  [F] React on mouse pressing ig view only.
  [F] One alignment for labels. [-] Unused checkbox.
  [+] QtCreator temporary file.
  [*] Refactoring of "draw axes" procedure. [-] Removed not working part of code for reloading textures. That do nothing, just show checkbox. As Yoda said: "Do. Or do not. There is no try."
  [-] Function "GetExtension" always return lowercase string. Using uppercase extension in desc is not needed.
  glTF/2.0: Pick scene zero as scene to recursively load if no "scene" property is specified.
  Fix GenVertexNormals
  [F] Wrong type in equation.
  [F] Uninitialized variables.
  Fix #1587 : add validation to LWS unit test
  Fix #1970: stl with empty solid
  Add test for issue 1970: STL with empty solid
  Add mesh name to ValidateDataStructure log
  Read and write the KHR_materials_unlit glTF/2.0 extension.
  ...

# Conflicts:
#	CMakeLists.txt
#	port/iOS/build.sh
2018-05-28 16:27:00 +03: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
Doron Adler c1f6683b20 Partial revert, build only 64bit targets 2018-03-20 14:45:54 +02:00
Doron Adler c2f22be99a Norod: Default build type is set as Release, no shared libraries 2018-03-20 13:46:03 +02:00
Doron Adler e2e09ba2fa Norod: Support building assimp as dylib for iOS (set as default) 2018-03-19 22:51:52 +02:00
Doron Adler 14a1b9980e Norod: Do not attempt to look for Qt5Widgets when building for iOS
Norod: Toolchain files get their SDKVER, DEVROOT and SDKROOT values from build.sh
Norod: Removed deprecated CMAKE_FORCE_
Norod: Build shared libs is now set-able from a flag, so to be more extendable later
Norod: .gitignore updated
2018-03-19 15:49:16 +02: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
Helio Chissini de Castro 4a0171bd82 - Apply mechanism to decide use for IrrXML external or internal
Several distributions usually decide for shared external libraries
instead of an usual embedded, for security reasons, duplicatiion issues.
This change enable the possibility to set SYSTEM_IRRXML=ON for detect
and build against a system installed irrxml.
By default, the internal copy is compiled.

Changes on build:
- Added a FindIrrXML cmake module.
- Moved the source recipe for proper CMakeLists inside contrib directory
- Includes aren't path based anymore, using the provided INCLUDE_DIR
- Compiler option are grouped in a singled entry on main CMakeLists

Note: Current internal assimp irrXML is older than upstream irrlicht 1.8.4.
To enable usage of this version, code need to be patched.
2017-04-29 08:10:44 +02:00
Helio Chissini de Castro 1ba843118b - Fix documentation install process. It's nonsense second BUILD_DOCS
check on doc/CMakeLists since is already checked on main CMakeLists.
At same time, Doxygen becomes required as no documentation can be built
without it.
Output directory now uses the user defined HTML_OUTPUT instead of
forced dir.
- Added included GNUInstallDirs on same UNIX check, avoiding duplication
of checks
2017-04-25 14:35:07 +02:00
Helio Chissini de Castro e4f05064df Enable doxygen been properly used from cmake build and install.
Current documentation lacks a proper directory handling and switch for
Unix like systems.
The option BUILD_DOCS are added as disable by default, even so the
Doxyfile file is generated for a manual build.

Option HTML_OUTPUT are made cached to be properly replaced, as usually
done by some Linux distributions

Microsoft CHM option is enabled if MSVC is detected.
2017-04-18 17:01:16 +02:00
Kim Kulling c1d1dfadb3 Unittests: prepare ctest usage. 2017-04-17 21:25:57 +02:00
Kim Kulling 069dbe6e9c CMake: Fix compatibility check for so-version of the assimp lib. 2017-04-06 16:32:17 +02:00
Galen Cochrane 0145eb866e fixed cmake typo preventing use of assimp as submodule in builds that prohibit in-source changes 2017-03-31 07:56:49 -06:00
Lucas Stanek 951f51a066 Import FindPkgMacros to main CMake Configuration 2017-03-02 03:12:47 +00:00
Antoine Bolvy 125d2ab955 Disable pkg-config on Android, and use the existing macro for minizip 2017-02-27 18:25:17 -05:00
Kim Kulling 9736003af0 Build: fix cmake warning: inconsistent name for if-endif. 2017-01-17 16:21:16 +01:00
Mika Rautio 350ee2ff68 Fix MinGW compilation support 2016-12-05 13:01:16 +02:00
Kim Kulling 05510f82af Unittest: fix a uppcase typo for the example FBX-file. 2016-12-02 16:47:54 +01:00
Kim Kulling 53d6adeb53 Enable coveralls measurement 2016-11-16 12:24:55 +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 1c5030c642 Remove some whitespaces. 2016-11-10 16:26:17 +01:00
Kim Kulling 3b61ff4cf2 Qt5-based Viewer: fix build. 2016-10-21 12:50:41 +02:00
Kim Kulling c98915e382 Merge pull request #949 from r-chris/fix-material-bugs
Fixing bugs related to 64-bit upgrade in materials
2016-09-12 09:41:58 +02:00
Kim Kulling 22cfe84cba 3MF: add a simple box example from the 3MF-sample repo. 2016-09-10 09:27:29 +02:00
Kim Kulling 7cedd4ab89 CMake: fix buildCMake: fix build.. 2016-09-10 08:48:01 +02:00
Lucas Stanek 4dfe2a1bad Add -fPIC to C Flags for 64bit linux Shared Object builds without checking if zlib is being built. 2016-08-19 03:28:55 +00:00
Lucas Stanek aef1b1c51b Building static ZLIB on 64b LInux requires -fPIC for C compiler. 2016-08-19 03:28:53 +00:00
Chris Russ 6613b6382f renaming define for double precision to be picked up by cmake correctly 2016-08-16 16:03:56 +10:00
Kim Kulling 39e52341c2 Fix copy-paste-error. 2016-08-14 21:24:00 +02:00
Kim Kulling ec67a1f2ea closes https://github.com/assimp/assimp/issues/97: define for 32-bit linux 2016-08-14 12:23:16 +02:00
Kim Kulling eb82a800cb CMakeLists: cleanup, move all options to one place for mantenace. 2016-08-13 09:13:22 +02:00
Kim Kulling ad133a05ec CMake: remove dead code. 2016-08-03 10:20:03 +02:00
Alexandr Arutjunov 6fe0895799 [F] Added checks for building assimp_qt_viewer. 2016-07-31 22:51:15 +03:00
Alexandr Arutjunov 2d921316ca [+] 3D viewer which uses Assimp and Qt4. 2016-07-31 14:56:30 +03:00
Chris Russ c57b524a59 moving cmake configure_file to appropriate location 2016-07-16 18:47:59 +10:00
Chris Russ ad8bb32561 Properly defining build-time defines in config.h 2016-07-16 18:23:33 +10:00
Chris Russ 5adb0e899c CMake Option and moving more functions to optional double support 2016-07-16 18:23:33 +10:00