Commit Graph

181 Commits (2efd2cdef88f498eb68c143902804d41e8ebcc50)

Author SHA1 Message Date
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