Commit Graph

22 Commits (40cfb45c74ab447092029b463d991ea1bda2d414)

Author SHA1 Message Date
Alexandr Arutjunov 24e25324f2 Merge branch 'master' into gltf_o3dgc 2016-09-13 12:08:51 +03:00
Kim Kulling 68e6f2a32c Unittest: add gtest as part of the contrib to avoid build issues on
offline systems.
2016-09-11 16:06:29 +02:00
Alexandr Arutjunov 7212ad9f0e [+] FindRT cmake module. 2016-09-10 09:16:47 +03:00
Sergei Nikulov 982d597acf updated gtest to github 2016-02-05 13:11:40 +03:00
Kim Kulling 8f70830103 Closes https://github.com/assimp/assimp/issues/84: add another search path
for XCode framework paths for IPhones.
2016-01-13 18:55:47 +01:00
Kim Kulling a148f1e28c Fix typo. 2015-12-27 00:15:14 +01:00
Kim Kulling 04832218a1 https://github.com/assimp/assimp/issues/728: XCode fix. 2015-12-27 00:07:37 +01: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 1fd66df37d Improved Findassimp.cmake to support VS2015. 2015-12-10 17:58:55 +01:00
Kim Kulling f2c2bc6945 CMake: add windows 8.1 search path for DirectX SDK, closes
assimp/assimp/issues/631
2015-09-21 17:31:27 +02:00
Richard 1d96486437 Refactored: Reformat CMake files to conform to editor config 2015-06-28 15:50:57 -06:00
Peter LaValle 69b9bfec51 skips tests on systems without git 2015-05-31 13:14:16 +01:00
Ser Lev Arris 2f372c0ac5 add the mingw compile step 2015-04-12 19:05:27 +02:00
Jared Duke 66e608a393 Replace cppunit with the googletest framework
The GTest framework has a more active support base, and natively
supports CMake. Introduce it as an external dependency (using CMake's
ExternalProject_Add), replacing cppunit and porting the associated unit
tests.
2014-09-07 16:52:03 -07:00
Kim Kulling 9245469fb8 bugfix: fix invalid include path in find assimp macro for cmake. 2014-05-11 14:01:30 +02:00
Kim Kulling 22d026ac40 update: add asset importer lib cmake find macro. 2014-05-11 13:56:38 +02:00
tszirr 681d732ef8 fix: pre-compiled header conflicts across different build configurations 2013-07-08 12:29:49 +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
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
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 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