v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,096 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

402 Commits (18bfbaeee12660ee2d3377f1fa18aacd7221c4b0)

Author SHA1 Message Date
Kim Kulling b049933d2f update license dates. 2018-01-28 19:42:05 +01:00
Kim Kulling 98325ee95d closes https://github.com/assimp/assimp/issues/1743: introduce /bigobj compile flag. 2018-01-27 09:20:22 +01:00
Marco Di Benedetto d33cc8ac5a Merge branch 'master' of https://github.com/assimp/assimp 2018-01-10 17:36:43 +01:00
Kim Kulling c66c7d7ae6 remove ctest to make workspace more readable. 2018-01-03 17:22:07 +01:00
Kim Kulling 65d29c5420
Update CMakeLists.txt 
Update version
 2017-12-11 13:22:20 +01:00
Mika Rautio 4fb5038fb1 Add support for building Mac OS X Framework bundles 2017-11-20 00:10:05 +02:00
Kim Kulling a8e65a1e8a Fix android build. 2017-11-18 18:32:16 +01:00
Kim Kulling c15c96ac76 CMake: use define for D_FILE_OFFSET_BITS only for not-android systems. 2017-11-14 20:11:40 +01:00
Andrea Baldacci, Ph.D 87ac6fbfd9
Update CMakeLists.txt 2017-10-31 02:05:01 +01:00
Turo Lamminen 6efe4e2841 CMake: Add support for Undefined Behavior sanitizer 2017-10-14 18:46:19 +03:00
Turo Lamminen 42142105fa CMake: Be more verbose about enabled options 2017-10-07 14:59:12 +03:00
Turo Lamminen d28e88feb7 CMake: Remove OpenMP stuff, it's unused and breaks Travis clang build 2017-10-06 18:22:58 +03:00
Kim Kulling c1f93a69ae Revert "WIP: Enable Travis clang build" 2017-10-06 15:42:05 +02:00
Turo Lamminen 452885672e CMake: Remove OpenMP stuff, it's unused and breaks Travis clang build 2017-10-05 10:45:40 +03:00
Kim Kulling cbca8f574e Merge pull request #1432 from turol/asan 
Asan
 2017-10-04 16:12:44 +02:00
Turo Lamminen b5db7d3649 Disable warning 4351 on MSVC 2013 2017-10-02 13:27:11 +03:00
Turo Lamminen 799f0a3ac8 Fix warnings-as-errors flag on MSVC 2017-10-02 11:40:57 +03:00
Turo Lamminen 4652b66bb5 Add AddressSanitizer option to CMake 2017-10-02 10:54:59 +03:00
Kim Kulling c202d43d8f Merge pull request #1466 from jaredmulconry/issue_1330 
Eliminated warnings when building the project with clang
 2017-10-01 20:03:30 +02:00
Turo Lamminen 77ce6e562d Fix CMAKE option name 2017-09-30 16:46:02 +03:00
Jared Mulconry a9e8836271 Added -fPIC flag to C compilers for GCC and clang. Removed -pedantic flag from some compilers. 2017-09-30 23:28:02 +10:00
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
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
abma d49e47c25c fix #431 2015-09-02 10:10:30 +02:00
abma fff2c4141e fix #634 2015-09-02 09:56:58 +02:00
Kim Kulling a78e3708d2 CMake build: fix debug postfix, will now be d only for debug builds. 2015-08-08 17:30:15 +02:00
Kim Kulling 99e7b221be CMake build: fix typo in docu.! 2015-08-08 17:24:06 +02:00
Russ Taylor 9474bbc8e9 Checks for DirectX. If it is not found, does not pull in the assimp_view project that needs it. 2015-07-04 16:08:26 -04:00
Richard 1d96486437 Refactored: Reformat CMake files to conform to editor config 2015-06-28 15:50:57 -06:00
Kim Kulling 6249a1c06f CMake: add comment for openddl-parser configuration. 2015-06-23 21:28:13 +02:00
Peter LaValle a00101cc02 changes to allow embedding 
changes several usages of CMAKE_SOURCE_DIR to CMAKE_CURRENT_SOURCE_DIR which allow embedding the assimp build in a larger CMake project

... as an alternative to dependency-hell
 2015-05-31 11:57:33 +01:00
Kim Kulling ab95b1a3c1 Replace tabs with whitespaces in CMake-file. 2015-05-30 18:13:08 +02:00
Jared Duke ef306d5666 Fix issue with CMAKE_CXX_FLAGS initialization 
Append the necessary flags to CMAKE_CXX_FLAGS, rather than replacing
the previous values. It's critical that that flags are preserved to
ensure proper and consistent compilation.
 2015-05-23 13:46:35 -07:00
U-ORADEV\albihern 7043551068 Modifying files to let assimp build under cygwin. 2015-04-20 17:36:47 -05:00
Ser Lev Arris cdeb95611d double definition, should better open my eyes... 2015-04-12 18:16:49 +02:00
Ser Lev Arris 7a6c00ca11 looks like cmake is per design not for building static executables, clang too. =%-| 2015-04-08 12:34:54 +02:00
arris69 297e1d2117 it's a difference if it's set to OFF or it's undefined... 2015-04-07 16:07:29 +02:00
Ser Lev Arris fb7661c430 add static flag for exe build if no shared build is requested 2015-04-07 08:20:27 +02:00
Kim Kulling 12efa14777 add openddl_parser directly to assimp. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-03-19 11:37:58 +01:00
Kim Kulling 2717d51f7e Merge remote-tracking branch 'origin/master' into opengex_support 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>

Conflicts:
	code/ParsingUtils.h
 2015-03-17 14:26:39 +01:00
ulf b71ded1ad0 - manually merged C4D importer code from acgessler branch 
- manually merged IFC bugfixes and improvements from schrompf branch
 2015-02-23 14:23:28 +01:00
OgreTransporter 4e8f7fb802 Fix Visual Studio prefixes 2015-02-08 12:26:29 +01:00
Kim Kulling 065ad7173a fix build: no c++11 support 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-07 18:26:57 +01:00
Kim Kulling 20b3ce6a40 replace opengexparser by using openddl-parser. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-02-07 12:47:53 +01:00
Kim Kulling 063b2733fc Merge branch 'master' into opengex_support 2015-01-31 11:09:20 +01:00
Kim Kulling 1ee4c06e4b add openddl-parser to contrib. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-31 11:07:48 +01:00
Ricardo Ortiz a94e668486 Define CMAKE_DEBUG_POSTFIX and use it instead of ASSIMP_DEBUG_PREFIX 
to have a consistent library name accross platforms.
 2015-01-23 14:19:29 -05:00
Kim Kulling af48644e56 fix build. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-03 01:09:33 +01:00
Kim Kulling df4db6e6e2 using cmake 3.0 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-02 20:34:37 +01:00
Kim Kulling 6820f1a5c9 workaround for compiler bug with mingw ( too many sections ). 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-02 15:34:23 +01:00
Kim Kulling 797c89c896 fix check for minimum version of cmake. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-02 15:33:47 +01:00
Kim Kulling 69dbf3713c fix typo 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2015-01-02 12:38:06 +01:00
Kim Kulling 7694561121 remove dead code from main CMakeLists.txt. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-12-16 22:34:24 +01:00
xantares 5c6921e2ea remove useless ASSIMP_BUILD_STATIC_LIB option 
BUILD_SHARED_LIBS must be used instead
 2014-11-27 08:58:29 +01:00
Timothy Gu 060f3c33d9 CMakeList: Support setting Libs.private 2014-10-14 22:28:14 -07:00
Filip Wasil 7224476ee1 Android JNI asset extraction support (API 9+) 
Signed-off-by: Filip Wasil <filip.wasil@tieto.com>
 2014-10-07 16:33:43 +02:00
OgreTransporter 9b3a88b2a5 New boost versions 2014-09-27 21:04:57 +02:00
abma d795491c48 fix unittests on linux / enable on travis-ci 2014-08-18 00:34:45 +02:00
abma aafc8d5f3f CMake: changed cached bools into "option" 2014-08-17 23:10:06 +02:00
Filip Wasil 139790f963 Assimp can now be built as a subproject in CMake based projects 
Signed-off-by: Filip Wasil <filip.wasil@gmail.com>
 2014-06-17 12:05:23 +02:00
Kim Kulling 01057f6ef0 bugfix: assimp now deals with boost 1.55. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-06-13 17:33:58 +02:00
Kim Kulling e09d88fa59 bugfix: fix cmake static linkage option. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-06-04 21:08:19 +02:00
Alexander Gessler 8b1a6ba920 Bump version number to 3.1 2014-06-02 01:45:23 +02:00
Léo Terziman 311f5b47ca Fixed bug during compilation with mingw & improved git revision support for automatic up to date revision number. 2014-05-19 14:36:24 +02:00
Kim Kulling 84491f22e2 update: enable tests as default because so it is much easier to run the unit tests after each bugfix. 
Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-05-04 15:20:26 +02:00
Léo Terziman 2047cf6764 Merge remote-tracking branch 'official/master' into contrib 2014-04-28 09:11:40 +02:00
xantares d4f25c0096 Configure assimp-config.cmake.in after Boost is discovered as it requires the Boost version vars 2014-04-23 14:12:10 +02:00
YoheiKakiuchi bd1d33e8e8 fix typo, BUILD_SHARED_LIBS 2014-04-23 19:14:38 +09:00
Léo Terziman 7c3a039349 Merge remote-tracking branch 'official/master' into contrib 
Conflicts:
	include/assimp/matrix4x4.inl
	include/assimp/vector2.h
	include/assimp/vector3.h
 2014-04-22 14:32:59 +02:00
xantares 0e62405406 use standard BUILD_SHARED_LIB option. Install dll to <prefix>/bin (mingw) 2014-04-21 21:36:33 +02:00
Léo Terziman 505a8d42aa Merge remote-tracking branch 'official/master' into contrib 
Conflicts:
	contrib/zlib/CMakeLists.txt
 2014-01-31 11:14:59 +01:00
Kim Kulling 630dd259f2 bugfix: 
- fix typo in cmake file.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
 2014-01-29 20:29:13 +01:00
Léo Terziman ca2314baa8 Fixed UTF8 encoding of CMakeFiles.txt 2014-01-17 12:21:37 +01:00
Léo Terziman 8bbe14c052 Merge commit '44773b8f9e47d9fe7e80946a1a9eb3d764fc8af2' into contrib 2014-01-17 11:52:08 +01:00
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
Hauke Rehfeld 268a07b950 Merge https://github.com/hrehfeld/assimp 2013-11-26 20:39:05 +01:00
Hauke Rehfeld 68b897e353 fix: only add uninstall target if not previously defined 2013-11-26 19:43:17 +01:00
Marcel Metz 93fd1133ff Fixed mingw cross compiler issues. 2013-11-20 14:40:20 +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
kimmi 8b8864a976 -WORKAROUND: Fix linux build for cmake users. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@494 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-10-11 12:58:21 +00:00
kimmi 82bb2313f0 - Add cmake buildfile for unitests ( currently no cppunit is part of the makefile ). 
- Add cmake buildfile for assimp_cmd application.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@463 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-08-02 20:53:30 +00:00
kimmi 0ec4348188 - Add first prototype for CMake enviroment. 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@390 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
 2009-04-18 00:10:16 +00:00