d48b93cf34
Merge branch 'master' into pugi_xml
2020-01-18 08:28:19 +01:00
03a17f87fa
Made the CMake config more submodule friendly.
2019-12-17 17:54:23 -08:00
13427c8d2b
Merge branch 'master' into warning-level-max
2019-12-11 19:16:30 +01:00
b10b8b2f1e
Merge branch 'master' into warning-level-max
2019-12-03 21:57:04 +01:00
5297529bb1
MSVC: Disable optimisations in debug build
...
Fixes #2799 and #2785
2019-12-02 10:07:48 +00:00
4754d2dc6d
Update CMakeLists.txt
...
- closes https://github.com/assimp/assimp/issues/2785
- Disable optimization in debug mode.
2019-11-27 17:32:55 +01:00
97dc0ce15d
Added CMake option to set the compiler warning to max (-Wall /W4). Off by default
2019-11-21 12:04:53 +11:00
61ea5a4ac6
Merge branch 'master' into collada_zae_textures_2710
2019-10-27 18:24:16 +01:00
d371a113fa
/DEBUG:FULL is not a compiler flag
2019-10-14 12:10:47 +01:00
6ac8279977
assimpTargets.cmake: define add_library() with lib type directly
...
Instead of using if(ON)/if(OFF) to determine which of the "hardcoded"
add_library(... SHARED ...) or (... STATIC ...) should be used,
specify a new BUILD_LIB_TYPE variable that is set directly to either
SHARED or STATIC and substituted in the `add_library()` statement
when assimpTargets.cmake.in is configured.
This removes a CMP0012 collision with prior `cmake_policy(VERSION 2.6)`
statement and makes the CMP0012 warning not appear in users' projects.
This problem is mentioned in issue #2685 .
2019-10-06 19:03:13 +02:00
13586eb073
remove the qt-viewer from the build system.
2019-09-21 18:02:37 +02:00
873a358ce4
A crash in the aiMesh descructor
2019-09-05 11:44:02 +01:00
4d9b350184
Update CMakeLists.txt
...
Remove optimization because irrxml sucks.
2019-09-03 15:17:42 +02:00
071504991a
Update CMakeLists.txt
...
Enable optimization
2019-09-03 11:39:05 +02:00
afb24d7a1c
Fix #2618
...
Added CXX flag -O3 for MinGW
2019-08-27 19:33:12 +03:00
74685477e6
Update CMakeLists.txt
...
Put it into the win32 for VS part.
2019-08-19 17:22:51 +02:00
e5372fc385
Update CMakeLists.txt
2019-08-18 15:44:38 +02:00
0400e0bc7f
Multi-Config generators should also set the debug suffix when enabled
...
Issue #2599
2019-08-16 11:10:30 +01:00
8761f3c67a
add pugi to include.
2019-08-08 22:07:06 +02:00
337df20209
Update CMakeLists.txt
2019-07-25 17:12:16 +02:00
a879102309
Update CMakeLists.txt
2019-07-25 16:27:35 +02:00
9dce8e40ba
Update CMakeLists.txt
2019-07-25 16:03:26 +02:00
d00f4f4b3a
Build Hunter-compatible config file
2019-06-13 21:34:47 -07:00
dab8041bcd
rewrite include paths for Hunter packages
2019-06-13 21:32:36 -07:00
a4587e8609
Use hunter to download dependencies if HUNTER_ENABLED is ON
2019-06-13 21:31:24 -07:00
1db3e1e11f
Allow CXX_STANDARD and other relevant compiler definitions to be set by Hunter user
2019-06-13 21:31:24 -07:00
dd9511aaef
Add HunterGate URL/SHA1
2019-06-13 21:31:24 -07:00
2da3a38d60
Fix the compile pass, still unresolved symbols.
2019-06-10 23:26:00 +02:00
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
0898484d45
Inno: fix folder names + versions.
2019-05-11 11:02:28 +02:00
e108b6f1d2
Merge branch 'master' into fix-mingw-debug-build
2019-05-01 17:04:45 +02:00
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
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
567a645c4f
* Improve error message for new check on MinGW compiler version
2019-04-10 10:31:57 -04:00
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
2a3626577f
Merge pull request #2 from assimp/master
...
Update to Assimp Master 0973f50
2019-04-08 14:06:36 +01:00
010afeb1d8
Merge branch 'master' into issue_1650
2019-04-04 12:42:21 +02:00
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
64bcf56101
Merge branch 'master' into issue_1650
2019-03-16 16:13:52 +01:00
ba6a7383b2
closes https://github.com/assimp/assimp/issues/1650 : build irrXml as shared lib.
2019-03-16 09:45:21 +01:00
925ac6b372
Typo
...
Fix a typo in a comment.
2019-03-10 11:17:52 +01:00
7d7574f189
Merge branch 'master' into ETC_Inc
2019-03-05 12:07:10 +00:00
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
0810b2d51b
Merge branch 'master' into ETC_Inc
2019-02-15 10:20:30 +01:00
a06133ab52
Update copyrights.
2019-01-30 09:41:39 +01:00
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
b4c427912f
added bitcode ios
2018-12-20 16:51:01 +02:00
a916c7b1e3
ensure that GitVersion fits into 32 bits
2018-11-26 12:06:38 +01:00
d1f7472242
Update CMakeLists.txt
2018-10-05 21:28:07 +02:00
3cf5fbb945
Update CMakeLists.txt
...
Fix the switches.
2018-10-05 20:45:41 +02:00
Kim Kulling
Alexey Panteleev
Kim Kulling
RichardTea
Dylan Kenneally
Robikz
Mike Samsonov
Daniel Bernar
anandvsingh
Pierre Anquez
Rahul Sheth
Jack Andersen
Charlie Gettys
Andy Maloney
Richard
Maxim Petrovsky
Martin Jeřábek