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