Rahul Sheth
d00f4f4b3a
Build Hunter-compatible config file
2019-06-13 21:34:47 -07:00
Rahul Sheth
dab8041bcd
rewrite include paths for Hunter packages
2019-06-13 21:32:36 -07:00
Rahul Sheth
a4587e8609
Use hunter to download dependencies if HUNTER_ENABLED is ON
2019-06-13 21:31:24 -07:00
Rahul Sheth
1db3e1e11f
Allow CXX_STANDARD and other relevant compiler definitions to be set by Hunter user
2019-06-13 21:31:24 -07:00
Rahul Sheth
dd9511aaef
Add HunterGate URL/SHA1
2019-06-13 21:31:24 -07:00
Kim Kulling
2da3a38d60
Fix the compile pass, still unresolved symbols.
2019-06-10 23:26:00 +02:00
Jack Andersen
d048bccad1
Export static libaries as CMake package
...
When built with BUILD_SHARED_LIBS disabled, the exported CMake
targets are modified to reference the static library location.
This also fixes version detection for VS2017 and beyond within
the target import script.
2019-05-24 22:06:50 -10:00
Kim Kulling
0898484d45
Inno: fix folder names + versions.
2019-05-11 11:02:28 +02:00
Kim Kulling
e108b6f1d2
Merge branch 'master' into fix-mingw-debug-build
2019-05-01 17:04:45 +02:00
RichardTea
692927a8a1
Default CMAKE_DEBUG_POSTFIX to 'd' on multiconfig
...
When the generator is multi config (eg MSVC, xcode) always set the debug postfix to 'd'
2019-04-17 10:03:18 +01:00
RichardTea
836801d37e
CMake updates for VS2015/cmake 3.12 onwards
...
cmake 3.12 adds MSVC_TOOLSET_VERSION to define the version of MSVC toolchain in use
Use that if present instead of if-elseif chain
2019-04-17 09:32:24 +01:00
Charlie Gettys
567a645c4f
* Improve error message for new check on MinGW compiler version
2019-04-10 10:31:57 -04:00
Charlie Gettys
6a373d55c7
* Add notes on MinGW compiler version requirements
...
* Add check on MinGW compiler version to force compliance.
* Closes #2315 ?
2019-04-10 10:07:24 -04:00
RichardTea
2a3626577f
Merge pull request #2 from assimp/master
...
Update to Assimp Master 0973f50
2019-04-08 14:06:36 +01:00
Kim Kulling
010afeb1d8
Merge branch 'master' into issue_1650
2019-04-04 12:42:21 +02:00
Andy Maloney
6c26268035
{cmake} Explicitly turn off ASM686 and AMD64 cmake options when ASSIMP_BUILD_ZLIB is on
...
The AMD64 option causes a build failure on MSVC (#1760 ) and the ASM builds seem to have problems:
https://github.com/madler/zlib/issues/41#issuecomment-125848075
This change also prevents these from "polluting" the cmake options if assimp is being included as a submodule.
2019-03-24 10:41:00 -04:00
Kim Kulling
64bcf56101
Merge branch 'master' into issue_1650
2019-03-16 16:13:52 +01:00
Kim Kulling
ba6a7383b2
closes https://github.com/assimp/assimp/issues/1650 : build irrXml as shared lib.
2019-03-16 09:45:21 +01:00
Kim Kulling
925ac6b372
Typo
...
Fix a typo in a comment.
2019-03-10 11:17:52 +01:00
RichardTea
7d7574f189
Merge branch 'master' into ETC_Inc
2019-03-05 12:07:10 +00:00
Andy Maloney
99c3697d12
Ensure our include directories get added in the correct order
...
If you have assimp installed already and in the include path (e.g. I have it via homebrew), it can pick up the wrong headers.
This forces the include order so our local ones are found first when building assimp.
2019-03-01 12:38:59 -05:00
Kim Kulling
0810b2d51b
Merge branch 'master' into ETC_Inc
2019-02-15 10:20:30 +01:00
kimkulling
a06133ab52
Update copyrights.
2019-01-30 09:41:39 +01:00
Richard
fe6b316695
Set MSVC projects to default to Unicode
...
MBCS is deprecated and shouldn't be used in new projects
2019-01-10 17:27:54 +00:00
Maxim Petrovsky
b4c427912f
added bitcode ios
2018-12-20 16:51:01 +02:00
Martin Jeřábek
a916c7b1e3
ensure that GitVersion fits into 32 bits
2018-11-26 12:06:38 +01:00
Kim Kulling
d1f7472242
Update CMakeLists.txt
2018-10-05 21:28:07 +02:00
Kim Kulling
3cf5fbb945
Update CMakeLists.txt
...
Fix the switches.
2018-10-05 20:45:41 +02:00
Kim Kulling
f588568c53
closes https://github.com/assimp/assimp/issues/2067 : introduce /bigobj compiler flag
2018-10-05 20:20:16 +02:00
Kim Kulling
aab796bc1c
Merge branch 'master' into master
2018-10-02 01:13:13 +02:00
Minmin Gong
4bd57f7577
Add IGNORE_GIT_HASH.
2018-09-30 19:25:43 -07:00
dormon
b43cf92337
Improved cmake configs for Windows and Linux.
...
Now the configs follows the standard cmake-package code: see https://cmake.org/cmake/help/v3.12/manual/cmake-packages.7.html
Downstreamer no longer have to manually specify target_include_directories with ${ASSIMP_INCLUDE_DIRS}, target_link_libraries with ${ASSIMP_LIBRARY_DIRS} and so on.
Downstreamer can now use:
find_package(assimp CONFIG REQUIRED)
target_link_libraries(AWESOME_APP PUBLIC assimp::assimp)
and everything should work.
Added assimpTargets.cmake.in
Added assimpTargets-debug.cmake.in
Added assimpTargets-release.cmake.in
Modified CMakeLists.txt
Modified code/CMakeLists.txt - added ALIAS assimp::assimp
Tested on Ubuntu 18.04 and Windows 10
2018-09-30 17:18:18 +02:00
Turo Lamminen
78fe96f8c4
Prepend our compiler flags instead of appending so overriding them works better
2018-09-18 11:08:01 +03:00
Turo Lamminen
6488bc6387
Disable strict aliasing optimizations
...
The code is not clean w.r.t the strict aliasing rules.
In particular LWS importer breaks with GCC >= 6.0 if this is enabled.
2018-09-18 11:08:01 +03:00
Kim Kulling
a7306abcfe
MDC-Loader: fix a possible nullptr access.
2018-08-31 19:29:17 +02:00
Kim Kulling
5a23810d82
Introduce header-only imagelib to make install of qt-viewer simpler.
2018-08-18 11:07:12 +02:00
Kim Kulling
063ae05310
Merge branch 'master' into 2075
2018-08-07 21:30:01 +02:00
Kim Kulling
11931b85fd
closes https://github.com/assimp/assimp/issues/2075 : Make inject of debug postfix an option, so you can swich it off.
2018-08-07 21:22:54 +02:00
Max Qian
a77887c874
Use a more accurate way of checking if the build is 64 bit
2018-07-26 08:08:07 -07:00
Kim Kulling
797446aadf
Merge branch 'master' into build-minizip-2
2018-07-10 14:34:46 +02:00
Brendan Hack
410b54d4b8
When building local zlib ensure we don't link to any system zlib or minzip.
2018-07-09 08:41:42 +10:00
Doron Adler
5b20ad3791
Fixed a mistake I Introduced in the build script where debug and shared-lib parameters were expecting a "="
...
Revert to default Release build type, but this time only for iOS
Do not attempt to use minizip if you are building for iOS shared dylib
Keep in mind that the "Shared" option only apply to the assimp library and not the other two built libraries
2018-07-01 14:48:20 +03:00
Doron Adler
6a45f84b73
Revert
2018-07-01 13:10:44 +03:00
Doron Adler
d79a82faa2
-Og for debug
2018-06-27 13:10:41 +03:00
Doron Adler
35871b6c37
Use -g or -O3 based on debug/release
2018-06-27 13:04:49 +03:00
Doron Adler
5428fa6dd5
Norod: Managed to get it past the make file creation phase
2018-06-27 11:39:14 +03:00
Doron Adler
eebf549e8e
Merge branch 'master' into ios-build-script
...
* master:
Fix regression on FBX importer unit test
Check nb of faces and vertices for FBX unit test
Update helper.py
Update helper.py
Solved pyassimp.errors.AssimpError in conda
Hide commit signature information when fetching commit hash
2018-06-27 09:59:51 +03:00
Pierre Moreau
8334bb579c
Hide commit signature information when fetching commit hash
...
If someone configures git to always show a commit’s signing information,
this breaks the definition of GitVersion in revision.h:
```
#ifndef ASSIMP_REVISION_H_INC
#define ASSIMP_REVISION_H_INC
#define GitVersion 0xgpg: Signature faite le Fri 15 Jun 2018 20:39:53 CEST
gpg: avec la clef RSA 4AEE18F83AFDEB23
gpg: Impossible de vérifier la signature : Pas de clef publique
878b4b2c
#define GitBranch "master"
#endif // ASSIMP_REVISION_H_INC
```
This can be avoided by passing the `--no-show-signature` to the `git
log` command for retrieving the hash.
2018-06-16 10:25:43 +02:00
Doron Adler
27b989fd36
Merge branch 'master' into ios-build-script
...
* master: (148 commits)
Update Importer.cpp
[-] Trace print removed.
[F] Get return "like true" when error occured.
[*] qt_assimp_viewer can be built with Qt4 or Qt5. [F] Working in doule precision.
[F] List of importers can be empty.
[F] More correct control by a mouse
[F] React on mouse pressing ig view only.
[F] One alignment for labels. [-] Unused checkbox.
[+] QtCreator temporary file.
[*] Refactoring of "draw axes" procedure. [-] Removed not working part of code for reloading textures. That do nothing, just show checkbox. As Yoda said: "Do. Or do not. There is no try."
[-] Function "GetExtension" always return lowercase string. Using uppercase extension in desc is not needed.
glTF/2.0: Pick scene zero as scene to recursively load if no "scene" property is specified.
Fix GenVertexNormals
[F] Wrong type in equation.
[F] Uninitialized variables.
Fix #1587 : add validation to LWS unit test
Fix #1970 : stl with empty solid
Add test for issue 1970: STL with empty solid
Add mesh name to ValidateDataStructure log
Read and write the KHR_materials_unlit glTF/2.0 extension.
...
# Conflicts:
# CMakeLists.txt
# port/iOS/build.sh
2018-05-28 16:27:00 +03:00
smalcom
67eff10d8f
[*] qt_assimp_viewer can be built with Qt4 or Qt5.
...
[F] Working in doule precision.
2018-05-25 21:19:06 +03:00
Jeroen Bollen
2d6782cc9f
Changed 'souces' to 'sources'.
...
There was a typo in the `CMakeLists.txt` where if zlib was not found, it would say "Compiling from souces" instead of "Compiling from sources". Added a 'r' to fix the typo.
2018-04-24 16:44:22 +02:00
kimkulling
f2833539d7
closes https://github.com/assimp/assimp/issues/1784 : change so.name to keep track of the minor version of the lib.
2018-04-19 08:52:21 +02:00
Kim Kulling
676e1c9565
Cmake: adapt cmake script for VS2017
2018-03-31 19:12:53 +02:00
Kim Kulling
417c4fcb45
Cmake: remove dead code.
2018-03-31 18:53:00 +02:00
Kim Kulling
dbf32abfb2
Build: use c++11 in openddl-parser as well.
2018-03-31 18:51:31 +02:00
Kim Kulling
349d877899
Update CMakeLists.txt
...
Remove dead code.
2018-03-22 21:28:52 +01:00
Kim Kulling
6c21a30958
closes https://github.com/assimp/assimp/issues/1850 : remove buggy setup in cmake.
2018-03-22 20:07:47 +01:00
Doron Adler
c1f6683b20
Partial revert, build only 64bit targets
2018-03-20 14:45:54 +02:00
Doron Adler
c2f22be99a
Norod: Default build type is set as Release, no shared libraries
2018-03-20 13:46:03 +02:00
Doron Adler
e2e09ba2fa
Norod: Support building assimp as dylib for iOS (set as default)
2018-03-19 22:51:52 +02:00
Doron Adler
14a1b9980e
Norod: Do not attempt to look for Qt5Widgets when building for iOS
...
Norod: Toolchain files get their SDKVER, DEVROOT and SDKROOT values from build.sh
Norod: Removed deprecated CMAKE_FORCE_
Norod: Build shared libs is now set-able from a flag, so to be more extendable later
Norod: .gitignore updated
2018-03-19 15:49:16 +02:00
Marco Di Benedetto
59ea3b6c85
fixed android zlib compile error.
2018-02-09 16:02:27 +01:00
Marco Di Benedetto
affedc139e
Merge https://github.com/assimp/assimp
2018-02-09 15:54:34 +01:00
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