v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

closes https://github.com/assimp/assimp/issues/911: use correct include 

path for unzip, when detected.
pull/917/head
Kim Kulling 2016-06-14 20:27:40 +02:00
parent f19dadbe97
commit 62e07a8af0
1 changed files with 45 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
code/CMakeLists.txt
View File

@ -202,7 +202,7 @@ SET(ASSIMP_LOADER_SRCS "")
SET(ASSIMP_IMPORTERS_ENABLED "") # list of enabled importers SET(ASSIMP_IMPORTERS_ENABLED "") # list of enabled importers
SET(ASSIMP_IMPORTERS_DISABLED "") # disabled list (used to print) SET(ASSIMP_IMPORTERS_DISABLED "") # disabled list (used to print)
ADD_ASSIMP_IMPORTER(3DS ADD_ASSIMP_IMPORTER( 3DS
3DSConverter.cpp 3DSConverter.cpp
3DSHelper.h 3DSHelper.h
3DSLoader.cpp 3DSLoader.cpp
@ -211,41 +211,41 @@ ADD_ASSIMP_IMPORTER(3DS
3DSExporter.cpp 3DSExporter.cpp
) )
ADD_ASSIMP_IMPORTER(AC ADD_ASSIMP_IMPORTER( AC
ACLoader.cpp ACLoader.cpp
ACLoader.h ACLoader.h
) )
ADD_ASSIMP_IMPORTER(ASE ADD_ASSIMP_IMPORTER( ASE
ASELoader.cpp ASELoader.cpp
ASELoader.h ASELoader.h
ASEParser.cpp ASEParser.cpp
ASEParser.h ASEParser.h
) )
ADD_ASSIMP_IMPORTER(ASSBIN ADD_ASSIMP_IMPORTER( ASSBIN
AssbinExporter.h AssbinExporter.h
AssbinExporter.cpp AssbinExporter.cpp
AssbinLoader.h AssbinLoader.h
AssbinLoader.cpp AssbinLoader.cpp
) )
ADD_ASSIMP_IMPORTER(ASSXML ADD_ASSIMP_IMPORTER( ASSXML
AssxmlExporter.h AssxmlExporter.h
AssxmlExporter.cpp AssxmlExporter.cpp
) )
ADD_ASSIMP_IMPORTER(B3D ADD_ASSIMP_IMPORTER( B3D
B3DImporter.cpp B3DImporter.cpp
B3DImporter.h B3DImporter.h
) )
ADD_ASSIMP_IMPORTER(BVH ADD_ASSIMP_IMPORTER( BVH
BVHLoader.cpp BVHLoader.cpp
BVHLoader.h BVHLoader.h
) )
ADD_ASSIMP_IMPORTER(COLLADA ADD_ASSIMP_IMPORTER( COLLADA
ColladaHelper.h ColladaHelper.h
ColladaLoader.cpp ColladaLoader.cpp
ColladaLoader.h ColladaLoader.h
@ -255,39 +255,39 @@ ADD_ASSIMP_IMPORTER(COLLADA
ColladaExporter.cpp ColladaExporter.cpp
) )
ADD_ASSIMP_IMPORTER(DXF ADD_ASSIMP_IMPORTER( DXF
DXFLoader.cpp DXFLoader.cpp
DXFLoader.h DXFLoader.h
DXFHelper.h DXFHelper.h
) )
ADD_ASSIMP_IMPORTER(CSM ADD_ASSIMP_IMPORTER( CSM
CSMLoader.cpp CSMLoader.cpp
CSMLoader.h CSMLoader.h
) )
ADD_ASSIMP_IMPORTER(HMP ADD_ASSIMP_IMPORTER( HMP
HMPFileData.h HMPFileData.h
HMPLoader.cpp HMPLoader.cpp
HMPLoader.h HMPLoader.h
HalfLifeFileData.h HalfLifeFileData.h
) )
ADD_ASSIMP_IMPORTER(IRRMESH ADD_ASSIMP_IMPORTER( IRRMESH
IRRMeshLoader.cpp IRRMeshLoader.cpp
IRRMeshLoader.h IRRMeshLoader.h
IRRShared.cpp IRRShared.cpp
IRRShared.h IRRShared.h
) )
ADD_ASSIMP_IMPORTER(IRR ADD_ASSIMP_IMPORTER( IRR
IRRLoader.cpp IRRLoader.cpp
IRRLoader.h IRRLoader.h
IRRShared.cpp IRRShared.cpp
IRRShared.h IRRShared.h
) )
ADD_ASSIMP_IMPORTER(LWO ADD_ASSIMP_IMPORTER( LWO
LWOAnimation.cpp LWOAnimation.cpp
LWOAnimation.h LWOAnimation.h
LWOBLoader.cpp LWOBLoader.cpp
@ -297,39 +297,39 @@ ADD_ASSIMP_IMPORTER(LWO
LWOMaterial.cpp LWOMaterial.cpp
) )
ADD_ASSIMP_IMPORTER(LWS ADD_ASSIMP_IMPORTER( LWS
LWSLoader.cpp LWSLoader.cpp
LWSLoader.h LWSLoader.h
) )
ADD_ASSIMP_IMPORTER(MD2 ADD_ASSIMP_IMPORTER( MD2
MD2FileData.h MD2FileData.h
MD2Loader.cpp MD2Loader.cpp
MD2Loader.h MD2Loader.h
MD2NormalTable.h MD2NormalTable.h
) )
ADD_ASSIMP_IMPORTER(MD3 ADD_ASSIMP_IMPORTER( MD3
MD3FileData.h MD3FileData.h
MD3Loader.cpp MD3Loader.cpp
MD3Loader.h MD3Loader.h
) )
ADD_ASSIMP_IMPORTER(MD5 ADD_ASSIMP_IMPORTER( MD5
MD5Loader.cpp MD5Loader.cpp
MD5Loader.h MD5Loader.h
MD5Parser.cpp MD5Parser.cpp
MD5Parser.h MD5Parser.h
) )
ADD_ASSIMP_IMPORTER(MDC ADD_ASSIMP_IMPORTER( MDC
MDCFileData.h MDCFileData.h
MDCLoader.cpp MDCLoader.cpp
MDCLoader.h MDCLoader.h
MDCNormalTable.h MDCNormalTable.h
) )
ADD_ASSIMP_IMPORTER(MDL ADD_ASSIMP_IMPORTER( MDL
MDLDefaultColorMap.h MDLDefaultColorMap.h
MDLFileData.h MDLFileData.h
MDLLoader.cpp MDLLoader.cpp
@ -343,22 +343,22 @@ SET( MaterialSystem_SRCS
) )
SOURCE_GROUP( MaterialSystem FILES ${MaterialSystem_SRCS}) SOURCE_GROUP( MaterialSystem FILES ${MaterialSystem_SRCS})
ADD_ASSIMP_IMPORTER(NFF ADD_ASSIMP_IMPORTER( NFF
NFFLoader.cpp NFFLoader.cpp
NFFLoader.h NFFLoader.h
) )
ADD_ASSIMP_IMPORTER(NDO ADD_ASSIMP_IMPORTER( NDO
NDOLoader.cpp NDOLoader.cpp
NDOLoader.h NDOLoader.h
) )
ADD_ASSIMP_IMPORTER(OFF ADD_ASSIMP_IMPORTER( OFF
OFFLoader.cpp OFFLoader.cpp
OFFLoader.h OFFLoader.h
) )
ADD_ASSIMP_IMPORTER(OBJ ADD_ASSIMP_IMPORTER( OBJ
ObjFileData.h ObjFileData.h
ObjFileImporter.cpp ObjFileImporter.cpp
ObjFileImporter.h ObjFileImporter.h
@ -367,12 +367,11 @@ ADD_ASSIMP_IMPORTER(OBJ
ObjFileParser.cpp ObjFileParser.cpp
ObjFileParser.h ObjFileParser.h
ObjTools.h ObjTools.h
ObjExporter.h ObjExporter.h
ObjExporter.cpp ObjExporter.cpp
) )
ADD_ASSIMP_IMPORTER(OGRE ADD_ASSIMP_IMPORTER( OGRE
OgreImporter.h OgreImporter.h
OgreStructs.h OgreStructs.h
OgreParsingUtils.h OgreParsingUtils.h
@ -385,7 +384,7 @@ ADD_ASSIMP_IMPORTER(OGRE
OgreMaterial.cpp OgreMaterial.cpp
) )
ADD_ASSIMP_IMPORTER(OPENGEX ADD_ASSIMP_IMPORTER( OPENGEX
OpenGEXExporter.cpp OpenGEXExporter.cpp
OpenGEXExporter.h OpenGEXExporter.h
OpenGEXImporter.cpp OpenGEXImporter.cpp
@ -393,7 +392,7 @@ ADD_ASSIMP_IMPORTER(OPENGEX
OpenGEXStructs.h OpenGEXStructs.h
) )
ADD_ASSIMP_IMPORTER(PLY ADD_ASSIMP_IMPORTER( PLY
PlyLoader.cpp PlyLoader.cpp
PlyLoader.h PlyLoader.h
PlyParser.cpp PlyParser.cpp
@ -402,18 +401,18 @@ ADD_ASSIMP_IMPORTER(PLY
PlyExporter.h PlyExporter.h
) )
ADD_ASSIMP_IMPORTER(MS3D ADD_ASSIMP_IMPORTER( MS3D
MS3DLoader.cpp MS3DLoader.cpp
MS3DLoader.h MS3DLoader.h
) )
ADD_ASSIMP_IMPORTER(COB ADD_ASSIMP_IMPORTER( COB
COBLoader.cpp COBLoader.cpp
COBLoader.h COBLoader.h
COBScene.h COBScene.h
) )
ADD_ASSIMP_IMPORTER(BLEND ADD_ASSIMP_IMPORTER( BLEND
BlenderLoader.cpp BlenderLoader.cpp
BlenderLoader.h BlenderLoader.h
BlenderDNA.cpp BlenderDNA.cpp
@ -431,7 +430,7 @@ ADD_ASSIMP_IMPORTER(BLEND
BlenderTessellator.cpp BlenderTessellator.cpp
) )
ADD_ASSIMP_IMPORTER(IFC ADD_ASSIMP_IMPORTER( IFC
IFCLoader.cpp IFCLoader.cpp
IFCLoader.h IFCLoader.h
IFCReaderGen.cpp IFCReaderGen.cpp
@ -454,13 +453,13 @@ if (MSVC AND ASSIMP_BUILD_IFC_IMPORTER)
set_source_files_properties(IFCReaderGen.cpp PROPERTIES COMPILE_FLAGS "/bigobj") set_source_files_properties(IFCReaderGen.cpp PROPERTIES COMPILE_FLAGS "/bigobj")
endif (MSVC AND ASSIMP_BUILD_IFC_IMPORTER) endif (MSVC AND ASSIMP_BUILD_IFC_IMPORTER)
ADD_ASSIMP_IMPORTER(XGL ADD_ASSIMP_IMPORTER( XGL
XGLLoader.cpp XGLLoader.cpp
XGLLoader.h XGLLoader.h
) )
ADD_ASSIMP_IMPORTER(FBX ADD_ASSIMP_IMPORTER( FBX
FBXImporter.cpp FBXImporter.cpp
FBXCompileConfig.h FBXCompileConfig.h
FBXImporter.h FBXImporter.h
@ -543,12 +542,12 @@ SET( PostProcessing_SRCS
) )
SOURCE_GROUP( PostProcessing FILES ${PostProcessing_SRCS}) SOURCE_GROUP( PostProcessing FILES ${PostProcessing_SRCS})
ADD_ASSIMP_IMPORTER(Q3D ADD_ASSIMP_IMPORTER( Q3D
Q3DLoader.cpp Q3DLoader.cpp
Q3DLoader.h Q3DLoader.h
) )
ADD_ASSIMP_IMPORTER(Q3BSP ADD_ASSIMP_IMPORTER( Q3BSP
Q3BSPFileData.h Q3BSPFileData.h
Q3BSPFileParser.h Q3BSPFileParser.h
Q3BSPFileParser.cpp Q3BSPFileParser.cpp
@ -558,39 +557,39 @@ ADD_ASSIMP_IMPORTER(Q3BSP
Q3BSPZipArchive.cpp Q3BSPZipArchive.cpp
) )
ADD_ASSIMP_IMPORTER(RAW ADD_ASSIMP_IMPORTER( RAW
RawLoader.cpp RawLoader.cpp
RawLoader.h RawLoader.h
) )
ADD_ASSIMP_IMPORTER(SIB ADD_ASSIMP_IMPORTER( SIB
SIBImporter.cpp SIBImporter.cpp
SIBImporter.h SIBImporter.h
) )
ADD_ASSIMP_IMPORTER(SMD ADD_ASSIMP_IMPORTER( SMD
SMDLoader.cpp SMDLoader.cpp
SMDLoader.h SMDLoader.h
) )
ADD_ASSIMP_IMPORTER(STL ADD_ASSIMP_IMPORTER( STL
STLLoader.cpp STLLoader.cpp
STLLoader.h STLLoader.h
STLExporter.h STLExporter.h
STLExporter.cpp STLExporter.cpp
) )
ADD_ASSIMP_IMPORTER(TERRAGEN ADD_ASSIMP_IMPORTER( TERRAGEN
TerragenLoader.cpp TerragenLoader.cpp
TerragenLoader.h TerragenLoader.h
) )
ADD_ASSIMP_IMPORTER(3D ADD_ASSIMP_IMPORTER( 3D
UnrealLoader.cpp UnrealLoader.cpp
UnrealLoader.h UnrealLoader.h
) )
ADD_ASSIMP_IMPORTER(X ADD_ASSIMP_IMPORTER( X
XFileHelper.h XFileHelper.h
XFileImporter.cpp XFileImporter.cpp
XFileImporter.h XFileImporter.h
@ -600,26 +599,23 @@ ADD_ASSIMP_IMPORTER(X
XFileExporter.cpp XFileExporter.cpp
) )
ADD_ASSIMP_IMPORTER(GLTF ADD_ASSIMP_IMPORTER( GLTF
glTFAsset.h glTFAsset.h
glTFAsset.inl glTFAsset.inl
glTFAssetWriter.h glTFAssetWriter.h
glTFAssetWriter.inl glTFAssetWriter.inl
glTFImporter.cpp glTFImporter.cpp
glTFImporter.h glTFImporter.h
glTFExporter.h glTFExporter.h
glTFExporter.cpp glTFExporter.cpp
) )
ADD_ASSIMP_IMPORTER(3MF ADD_ASSIMP_IMPORTER( 3MF
D3MFImporter.h D3MFImporter.h
D3MFImporter.cpp D3MFImporter.cpp
D3MFOpcPackage.h D3MFOpcPackage.h
D3MFOpcPackage.cpp D3MFOpcPackage.cpp
) )
@ -822,7 +818,7 @@ if (UNZIP_FOUND)
INCLUDE_DIRECTORIES(${UNZIP_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${UNZIP_INCLUDE_DIRS})
TARGET_LINK_LIBRARIES(assimp ${UNZIP_LIBRARIES}) TARGET_LINK_LIBRARIES(assimp ${UNZIP_LIBRARIES})
else (UNZIP_FOUND) else (UNZIP_FOUND)
INCLUDE_DIRECTORIES("../contrib/unzip") INCLUDE_DIRECTORIES("../")
endif (UNZIP_FOUND) endif (UNZIP_FOUND)
INSTALL( TARGETS assimp INSTALL( TARGETS assimp