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
Kim Kulling
4116b341aa
closes https://github.com/assimp/assimp/issues/938 : adapt instal pathes.
2016-07-12 09:04:38 +02:00
Kim Kulling
a8673d4828
Merge pull request #941 from assimp/feature/issue_940
...
Feature/issue 940
2016-07-08 19:29:51 +02:00
Kim Kulling
c87375a8a8
CMake: fix version for bugfix release.
2016-07-08 18:37:25 +02:00
Sven Liedtke
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
Kim Kulling
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
Kim Kulling
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
Fabian Herb
616aa022a7
CMake: whitespace consistency, variable naming
2016-07-01 16:57:45 +02:00
cmdrf
9c7de7b2a8
Update to latest Melange SDK
2016-07-01 14:50:46 +02:00
Kim Kulling
93caa17371
CMake: use CMAKE_CURRENT_LIST_DIR instead of CmakeSourceDir.
2016-06-30 00:42:08 +02:00
Chris Russ
2c6c19d656
allowing to enable building of zlib manually
2016-06-22 17:38:10 +10:00
Kim Kulling
950eb7ef9a
Add project root to include.
2016-06-11 01:14:25 +02:00
Otger
d9b365eb90
Fixed a few GLTF importer/exporter bugs
2016-04-28 18:44:47 +02:00
Kim Kulling
829e56df0c
cmake env: add license info.
2016-04-23 09:42:05 +02:00
Kim Kulling
019226c119
CMake build: enabme c++11 for mingw.
2016-04-21 00:02:28 +02:00
mensinda
ce5908e4ec
Removed boost from CMakeLists.txt
2016-04-06 10:29:41 +02:00
Kim Kulling
8a3b6523f2
Update CMakeLists.txt
...
CMake for debian package: fix home url of asset importer lib.
2016-04-05 16:30:56 +02:00
Kim Kulling
b573676a1b
Update CMakeLists.txt
...
Enable c++11 support manually by using the compiler flags.
2016-03-31 11:26:38 +02:00
Kim Kulling
c53903ff0b
Update CMakeLists.txt
...
Enable c++11 support for this branch.
2016-03-31 11:11:55 +02:00
Wietse
8314a20c56
Update CMakeLists.txt
...
Changed "add_definitions" to "add_compile_options" to fix building with NMake.
Using "add_definitions" adds "/MP" to the resource compiler options which results in a fatal error when run with NMake.
2016-03-14 23:14:31 +01:00
Andrey Kazantsev
b8fbf3ad29
Resolves #802
2016-02-22 22:24:03 +02:00
Vertexwahn
270355f326
Improved Findassimp.cmake to support VS2013. Added deployment of VS2013 libs and dll files.
2015-12-11 10:33:47 +01:00
Vertexwahn
c6d1fcca74
Added custom target that copies generated libs and bin files to lib32/lib64 and bin32/64 folder
2015-12-10 17:15:27 +01:00
Kim Kulling
c318d648ff
CMake: set version number to 3.2
2015-11-03 19:47:37 +01:00
Håvard Mathisen
367c9980b2
Add Boost 1.59
2015-09-20 17:15:01 +02:00