f30fd58494
fix review findings.,
2017-06-28 22:08:20 +02:00
4399922ea1
fixed CMAKE_MODULE_PATH overwriting previous values
2017-06-10 20:12:12 +02:00
dcc5887817
Update CMakeLists.txt
...
Enable check for OpenMP-support.
2017-06-02 11:20:48 +02:00
0a35fa0aef
Update CMakeLists.txt
...
Build: Make windows headers much smaller.
2017-06-01 15:50:19 +02:00
9eb0a3f3d5
Fix error when custom CMAKE_C_FLAGS is specified
2017-05-23 15:34:02 +02:00
5289954e27
Fix review findings.
2017-05-06 20:57:17 +02:00
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
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
3e5e3a54b9
Merge branch 'master' of https://github.com/assimp/assimp
2017-04-29 15:10:35 -06:00
6f00ca558d
Group libstdc++ entry in the compiler optionas as well
2017-04-29 08:44:58 +02:00
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
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
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
c1d1dfadb3
Unittests: prepare ctest usage.
2017-04-17 21:25:57 +02:00
069dbe6e9c
CMake: Fix compatibility check for so-version of the assimp lib.
2017-04-06 16:32:17 +02:00
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
951f51a066
Import FindPkgMacros to main CMake Configuration
2017-03-02 03:12:47 +00:00
125d2ab955
Disable pkg-config on Android, and use the existing macro for minizip
2017-02-27 18:25:17 -05:00
9736003af0
Build: fix cmake warning: inconsistent name for if-endif.
2017-01-17 16:21:16 +01:00
350ee2ff68
Fix MinGW compilation support
2016-12-05 13:01:16 +02:00
05510f82af
Unittest: fix a uppcase typo for the example FBX-file.
2016-12-02 16:47:54 +01:00
53d6adeb53
Enable coveralls measurement
2016-11-16 12:24:55 +01:00
a6c86c79f1
Travis: enable coverall support.
2016-11-16 11:39:44 +01:00
a1f773c305
Merge branch 'master' of https://github.com/assimp/assimp
2016-11-14 20:34:52 +01:00
855031d37c
CmakeLists: remove ugly and deprecated hack fo mingw.
2016-11-14 20:20:03 +01:00
1c5030c642
Remove some whitespaces.
2016-11-10 16:26:17 +01:00
3b61ff4cf2
Qt5-based Viewer: fix build.
2016-10-21 12:50:41 +02:00
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
22cfe84cba
3MF: add a simple box example from the 3MF-sample repo.
2016-09-10 09:27:29 +02:00
7cedd4ab89
CMake: fix buildCMake: fix build..
2016-09-10 08:48:01 +02:00
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
aef1b1c51b
Building static ZLIB on 64b LInux requires -fPIC for C compiler.
2016-08-19 03:28:53 +00:00
6613b6382f
renaming define for double precision to be picked up by cmake correctly
2016-08-16 16:03:56 +10:00
39e52341c2
Fix copy-paste-error.
2016-08-14 21:24:00 +02:00
ec67a1f2ea
closes https://github.com/assimp/assimp/issues/97 : define for 32-bit linux
2016-08-14 12:23:16 +02:00
eb82a800cb
CMakeLists: cleanup, move all options to one place for mantenace.
2016-08-13 09:13:22 +02:00
ad133a05ec
CMake: remove dead code.
2016-08-03 10:20:03 +02:00
6fe0895799
[F] Added checks for building assimp_qt_viewer.
2016-07-31 22:51:15 +03:00
2d921316ca
[+] 3D viewer which uses Assimp and Qt4.
2016-07-31 14:56:30 +03:00
c57b524a59
moving cmake configure_file to appropriate location
2016-07-16 18:47:59 +10:00
ad8bb32561
Properly defining build-time defines in config.h
2016-07-16 18:23:33 +10:00
5adb0e899c
CMake Option and moving more functions to optional double support
2016-07-16 18:23:33 +10:00
4116b341aa
closes https://github.com/assimp/assimp/issues/938 : adapt instal pathes.
2016-07-12 09:04:38 +02:00
a8673d4828
Merge pull request #941 from assimp/feature/issue_940
...
Feature/issue 940
2016-07-08 19:29:51 +02:00
c87375a8a8
CMake: fix version for bugfix release.
2016-07-08 18:37:25 +02:00
e16a383999
[Fix] Remove CMake Warning (dev) in external/assimp/CMakeLists.txt with mis-matching arguments for logical block
2016-07-05 10:21:29 +02:00
614096ddb1
Merge pull request #931 from cmdrf/update-melange-sdk
...
C4D Support: Update to Newest Melange SDK
2016-07-04 15:06:58 +02:00
a62ea5497d
Merge pull request #932 from r-chris/make-zlib-optional
...
Allowing to enable building of zlib manually through CMake option.
2016-07-04 15:00:13 +02:00
616aa022a7
CMake: whitespace consistency, variable naming
2016-07-01 16:57:45 +02:00
9c7de7b2a8
Update to latest Melange SDK
2016-07-01 14:50:46 +02:00
Kim Kulling
Tomas Maly
Kim Kulling
rdb
Kim Kulling
Helio Chissini de Castro
Galen Cochrane
Kim Kulling
Lucas Stanek
Antoine Bolvy
Mika Rautio
Chris Russ
Alexandr Arutjunov
Sven Liedtke
Fabian Herb
cmdrf