Léo Terziman
cafa3d5811
Merge commit '89fbda0957ddc842d27a3a610c10bf2fe840a64f' into contrib
2014-01-17 11:38:16 +01:00
Léo Terziman
ff5df971cb
Fixing compiler flags for mingw
2014-01-17 11:33:20 +01:00
Léo Terziman
2071b4fb2f
Merge commit 'ca7542cf5d11ccde33e18365889343088bad9582' into contrib
...
Conflicts:
CMakeLists.txt
contrib/zlib/CMakeLists.txt
contrib/zlib/zconf.h.included
2014-01-17 11:30:33 +01:00
Léo Terziman
647eab6ae9
Improving CMake to build the static version of assimp with the static version of zlib
2014-01-17 11:25:39 +01:00
Léo Terziman
e4867646ab
Small corrections for the upgrading of zlib
2014-01-17 11:25:22 +01:00
Kim Kulling
89fbda0957
bugfix : fix Issue #176 cmake variables are now using quotes.
...
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
2013-11-09 21:17:12 +01:00
Alexander Gessler
639afc6f01
Apply patch from #168 . Revert contrib/zlib/CMakeLists.txt hack from 561f3bc6ea
, but leave all Zlib install stuff commented.
2013-10-29 00:52:47 +01:00
Alexander Gessler
561f3bc6ea
Update CMakeLists.txt for zlib to build on MSVC again, closes #170 .
2013-10-27 18:19:08 +01:00
acgessler
56c4ee5525
Turn ASSIMP_BUILD_BOOST_WORKAROUND on by default, fixes #144
2013-10-06 22:30:19 +02:00
Alexander Gessler
b786d6e375
- CMake: enable multicore compilation with msvc.
2013-04-21 15:03:16 +02:00
Alexander Gessler
4b748c2442
- CMake: use precompiled headers when compiling for msvc. This makes compilation about 40% faster.
2013-04-20 23:15:59 +02:00
Kim
18feb628c1
update : add new boost versions to cmake-lookup.
...
Signed-off-by: Kim <Kulling>
2013-03-28 20:24:58 +01:00
rdiankov
241c35abb2
removed ASSIMP_LIBRARY_SUFFIX
2013-03-18 21:11:49 +09:00
rdiankov
16744d78d7
fixed the broken cmake config files (assimp-cmake), adding version suffix libraries
2013-02-26 14:02:35 +09:00
Alexander Gessler
bae9db2f03
Merge branch 'master' of git://github.com/assimp/assimp
2012-12-21 16:24:05 +01:00
ulfjorensen
81aef90f4a
- manually pulled the three smaller change requests from Github.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1331 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-11-05 09:13:09 +00:00
Alexander Gessler
776d8e339b
Merge branch 'master' of https://github.com/assimp/assimp
2012-07-24 03:30:47 +02:00
aramis_acg
aaf0be0bbf
- CMake overhaul. Add proper FindXXX scripts for PkgMacros, ZLIB, DirectX. Isolate MSVC-specific defines. Add newer boost versions to boost whitelist. Many thanks to Mr. S. for the patch! (see http://zfx.info/viewtopic.php?f=9&t=334&p=32190#p32190 )
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1293 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-07-17 22:56:15 +00:00
aramis_acg
f849f6d9bd
- merge 3.0 up to r1281 in trunk
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1283 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-07-11 12:53:04 +00:00
acgessler
5391ef9d6a
- CMake: enable -Wall when building with gcc
2012-07-08 03:28:36 +02:00
kimmi
eb3fd360f4
- Bugfix : Fix invalid variable ASSIMP_LIBRARY_DIRS.
...
- Update : Introduce a subversion-revision variable for the right patch version.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1260 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-06-18 19:33:17 +00:00
kimmi
526150a8e3
Update: Debian-related cmake changes ( I changed the revision to 1256 instead of 1251 ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1256 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-06-11 11:49:08 +00:00
kimmi
97995e41f4
Debian-specific adapting cmake.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1255 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-06-05 19:30:45 +00:00
aramis_acg
5aeed46a25
# CMake, samples and tools can now be switched on/off independently.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1227 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-21 02:19:18 +00:00
klickverbot
3b0d2cbdb3
Enable simple OpenGL sample under Linux.
...
Thanks to Marcel Metz for the patch.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1206 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-19 18:40:48 +00:00
jonathanklein
62b2ca3c1b
Support for boost 1.49
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1188 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-03-03 15:18:43 +00:00
jonathanklein
eebba5348d
- Added Debug Postfix
...
- added Viewer Installer
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1172 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-02-18 10:55:47 +00:00
kimmi
007dae433f
Update : Boost lookup uses now additional versions ( thanks to Jonathan from zfx ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1123 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2012-01-25 18:33:46 +00:00
mmathias01
2c0b36bc45
Update CMake environment to accept BUILD_STATIC_LIB option to allow building of static library for platforms that require it (such as iOS). Sorry if I overstepped any bounds here; feel free to revert if required.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1088 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-11-24 10:59:09 +00:00
kimmi
e8d8b23d52
Update : Add an architecture var to cmake.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1082 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-09-28 09:04:49 +00:00
aramis_acg
1204c8cdaf
# CMake: make sure -fvisibility=hidden is only used with gcc.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1069 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-22 20:52:02 +00:00
aramis_acg
9d85c8834d
- extract MaterialHelper and move all of its members to aiMaterial in /include.
...
- pull in IOhannes' patch to set the gcc default visibility for all symbols to NO and to mark ASSIMP_API with __attribute__ ((visibility("default"))).
- drop unneeded ASSIMP_API from most internal classes in /code, we just need to keep some exports on Windows to keep AssimpView alive.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1066 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-08-22 20:22:51 +00:00
aramis_acg
e7c9e4d5aa
[3309083] Allow external unzip, and buildsys cleanup (many thanks to Rick Mattes for the patch).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1011 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-30 14:13:33 +00:00
aramis_acg
c05acabea9
- update cmake build environment, now includes targets to build debian packages for Assimp.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@997 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-05-09 19:34:21 +00:00
aramis_acg
4bde6808b2
- CMakeLists: turn on export functionality by default, offer NO_EXPORT option to turn it off.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@931 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-04-03 11:21:34 +00:00
kimmi
5f10c38baa
BUGFIX: Use the correct path for the file assimp.pc.in ( thanks to Roman Kharitonov ).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@925 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2011-03-31 21:38:18 +00:00
aramis_acg
e76dc77562
update version number for the CMake build
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@854 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-11-21 18:48:14 +00:00
kimmi
0fd0f68b26
UPDATE: Add opengl-samples to cmake build enviroment for windows systems.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@823 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-10-03 12:08:21 +00:00
klickverbot
72e5b99baa
CMake: Added two configuration options for excluding the unit tests and the tools from the build.
...
By default, the tools are built along the library, the tests are not, however.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@821 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-09-27 08:31:09 +00:00
klickverbot
315649313e
CMake: Fixed building with Boost workaround.
...
The path to the include directory had not been updated when the snippet was moved into the top-level CMakeLists.txt.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@820 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-09-27 08:30:54 +00:00
klickverbot
c1430e1573
CMake: Show a helpful error message with CMake 2.8+ if Boost has not been found.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@819 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-09-27 08:30:37 +00:00
klickverbot
b0196db29f
CMake: Fixed building tools when the Boost headers are not in the default include path; fixed pkg-config file installation for out-of-source builds.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@802 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-25 16:46:21 +00:00
aramis_acg
9623663671
[3051124] cmake pkg-config assimp.pc file gen.; fix minor issue with assimp.pc INSTALL.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@797 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-23 15:44:59 +00:00
aramis_acg
fa0029ca2b
[3051124] cmake pkg-config assimp.pc file gen; Thanks to Filipe Vieira for the patch.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@794 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-08-23 11:43:15 +00:00
klickverbot
9343c3b28f
Only use bin/ and lib/ as output directories if doing an in-source build.
...
This prevents littering the source tree if the user does not want to.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@579 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-03 22:55:02 +00:00
klickverbot
ed41aa8ce1
Renamed CMake project to Assimp, as the semi-full name »AssetImporter« was used nowhere else.
...
Sorry, kimmi, if this was on purpose – feel free to revert.
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@578 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-03 22:07:59 +00:00
klickverbot
ac8479f542
Moved private headers to code/ as discussed; removed boost::random workaround which was no longer needed; CMake cleanup part two (Boost detection, …).
...
Please be quick to suspect this commit if the build should break on Windows/MSVC.
(Again, sorry for the large commit, but I didnt want to flood the commit log with my git-style tiny commits.)
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@577 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-03 21:48:23 +00:00
klickverbot
ee6c6e5187
CMake cleanup, part one (sorry for the large commit).
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@576 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-03 21:46:56 +00:00
aramis_acg
f7aa189118
Add assimp command line tools to CMAKE build. Add it to make install as well. Needs more testing on different systems.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@568 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-03-02 19:27:36 +00:00
kimmi
7050ae5a3d
- UPDATE : Add Install target to CMake build.
...
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@556 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
2010-02-27 12:00:00 +00:00