Merge pull request #3022 from iamAdrianIusca/master
small improvements in the CMakeLists.txt filepull/3038/head
commit
f343d3eec2
|
@ -252,35 +252,39 @@ MACRO(ADD_ASSIMP_IMPORTER name)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
ENDMACRO()
|
ENDMACRO()
|
||||||
|
|
||||||
# if this variable is set to TRUE, the user can manually disable exporters by setting
|
if (NOT ASSIMP_NO_EXPORT)
|
||||||
# ASSIMP_BUILD_XXX_EXPORTER to FALSE for each exporter
|
|
||||||
# if this variable is set to FALSE, the user can manually enable exporters by setting
|
|
||||||
# ASSIMP_BUILD_XXX_EXPORTER to TRUE for each exporter
|
|
||||||
OPTION(ASSIMP_BUILD_ALL_EXPORTERS_BY_DEFAULT "default value of all ASSIMP_BUILD_XXX_EXPORTER values" TRUE)
|
|
||||||
|
|
||||||
# macro to add the CMake Option ADD_ASSIMP_IMPORTER_<name> which enables compile of loader
|
# if this variable is set to TRUE, the user can manually disable exporters by setting
|
||||||
# this way selective loaders can be compiled (reduces filesize + compile time)
|
# ASSIMP_BUILD_XXX_EXPORTER to FALSE for each exporter
|
||||||
MACRO(ADD_ASSIMP_EXPORTER name)
|
# if this variable is set to FALSE, the user can manually enable exporters by setting
|
||||||
IF (ASSIMP_NO_EXPORT)
|
# ASSIMP_BUILD_XXX_EXPORTER to TRUE for each exporter
|
||||||
set(ASSIMP_EXPORTER_ENABLED FALSE)
|
OPTION(ASSIMP_BUILD_ALL_EXPORTERS_BY_DEFAULT "default value of all ASSIMP_BUILD_XXX_EXPORTER values" TRUE)
|
||||||
ELSEIF (ASSIMP_BUILD_ALL_EXPORTERS_BY_DEFAULT)
|
|
||||||
set(ASSIMP_EXPORTER_ENABLED TRUE)
|
# macro to add the CMake Option ADD_ASSIMP_IMPORTER_<name> which enables compile of loader
|
||||||
IF (DEFINED ASSIMP_BUILD_${name}_EXPORTER AND NOT ASSIMP_BUILD_${name}_EXPORTER)
|
# this way selective loaders can be compiled (reduces filesize + compile time)
|
||||||
|
MACRO(ADD_ASSIMP_EXPORTER name)
|
||||||
|
IF (ASSIMP_NO_EXPORT)
|
||||||
set(ASSIMP_EXPORTER_ENABLED FALSE)
|
set(ASSIMP_EXPORTER_ENABLED FALSE)
|
||||||
|
ELSEIF (ASSIMP_BUILD_ALL_EXPORTERS_BY_DEFAULT)
|
||||||
|
set(ASSIMP_EXPORTER_ENABLED TRUE)
|
||||||
|
IF (DEFINED ASSIMP_BUILD_${name}_EXPORTER AND NOT ASSIMP_BUILD_${name}_EXPORTER)
|
||||||
|
set(ASSIMP_EXPORTER_ENABLED FALSE)
|
||||||
|
ENDIF ()
|
||||||
|
ELSE ()
|
||||||
|
set(ASSIMP_EXPORTER_ENABLED ${ASSIMP_BUILD_${name}_EXPORTER})
|
||||||
ENDIF ()
|
ENDIF ()
|
||||||
ELSE ()
|
|
||||||
set(ASSIMP_EXPORTER_ENABLED ${ASSIMP_BUILD_${name}_EXPORTER})
|
|
||||||
ENDIF ()
|
|
||||||
|
|
||||||
IF (ASSIMP_EXPORTER_ENABLED)
|
IF (ASSIMP_EXPORTER_ENABLED)
|
||||||
SET(ASSIMP_EXPORTERS_ENABLED "${ASSIMP_EXPORTERS_ENABLED} ${name}")
|
SET(ASSIMP_EXPORTERS_ENABLED "${ASSIMP_EXPORTERS_ENABLED} ${name}")
|
||||||
LIST(APPEND ASSIMP_EXPORTER_SRCS ${ARGN})
|
LIST(APPEND ASSIMP_EXPORTER_SRCS ${ARGN})
|
||||||
SOURCE_GROUP(${name}_EXPORTER FILES ${ARGN})
|
SOURCE_GROUP(${name}_EXPORTER FILES ${ARGN})
|
||||||
ELSE()
|
ELSE()
|
||||||
SET(ASSIMP_EXPORTERS_DISABLED "${ASSIMP_EXPORTERS_DISABLED} ${name}")
|
SET(ASSIMP_EXPORTERS_DISABLED "${ASSIMP_EXPORTERS_DISABLED} ${name}")
|
||||||
add_definitions(-DASSIMP_BUILD_NO_${name}_EXPORTER)
|
add_definitions(-DASSIMP_BUILD_NO_${name}_EXPORTER)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
ENDMACRO()
|
ENDMACRO()
|
||||||
|
|
||||||
|
endif()
|
||||||
|
|
||||||
SET(ASSIMP_LOADER_SRCS "")
|
SET(ASSIMP_LOADER_SRCS "")
|
||||||
SET(ASSIMP_IMPORTERS_ENABLED "") # list of enabled importers
|
SET(ASSIMP_IMPORTERS_ENABLED "") # list of enabled importers
|
||||||
|
@ -307,11 +311,6 @@ ADD_ASSIMP_IMPORTER( 3DS
|
||||||
3DS/3DSLoader.h
|
3DS/3DSLoader.h
|
||||||
)
|
)
|
||||||
|
|
||||||
ADD_ASSIMP_EXPORTER( 3DS
|
|
||||||
3DS/3DSExporter.h
|
|
||||||
3DS/3DSExporter.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
ADD_ASSIMP_IMPORTER( AC
|
ADD_ASSIMP_IMPORTER( AC
|
||||||
AC/ACLoader.cpp
|
AC/ACLoader.cpp
|
||||||
AC/ACLoader.h
|
AC/ACLoader.h
|
||||||
|
@ -329,20 +328,6 @@ ADD_ASSIMP_IMPORTER( ASSBIN
|
||||||
Assbin/AssbinLoader.cpp
|
Assbin/AssbinLoader.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
ADD_ASSIMP_EXPORTER( ASSBIN
|
|
||||||
Assbin/AssbinExporter.h
|
|
||||||
Assbin/AssbinExporter.cpp
|
|
||||||
Assbin/AssbinFileWriter.h
|
|
||||||
Assbin/AssbinFileWriter.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
ADD_ASSIMP_EXPORTER( ASSXML
|
|
||||||
Assxml/AssxmlExporter.h
|
|
||||||
Assxml/AssxmlExporter.cpp
|
|
||||||
Assxml/AssxmlFileWriter.h
|
|
||||||
Assxml/AssxmlFileWriter.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
ADD_ASSIMP_IMPORTER( B3D
|
ADD_ASSIMP_IMPORTER( B3D
|
||||||
B3D/B3DImporter.cpp
|
B3D/B3DImporter.cpp
|
||||||
B3D/B3DImporter.h
|
B3D/B3DImporter.h
|
||||||
|
@ -362,11 +347,6 @@ ADD_ASSIMP_IMPORTER( COLLADA
|
||||||
Collada/ColladaParser.h
|
Collada/ColladaParser.h
|
||||||
)
|
)
|
||||||
|
|
||||||
ADD_ASSIMP_EXPORTER( COLLADA
|
|
||||||
Collada/ColladaExporter.h
|
|
||||||
Collada/ColladaExporter.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
ADD_ASSIMP_IMPORTER( DXF
|
ADD_ASSIMP_IMPORTER( DXF
|
||||||
DXF/DXFLoader.cpp
|
DXF/DXFLoader.cpp
|
||||||
DXF/DXFLoader.h
|
DXF/DXFLoader.h
|
||||||
|
@ -423,11 +403,6 @@ ADD_ASSIMP_IMPORTER( M3D
|
||||||
M3D/m3d.h
|
M3D/m3d.h
|
||||||
)
|
)
|
||||||
|
|
||||||
ADD_ASSIMP_EXPORTER( M3D
|
|
||||||
M3D/M3DExporter.h
|
|
||||||
M3D/M3DExporter.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
ADD_ASSIMP_IMPORTER( MD2
|
ADD_ASSIMP_IMPORTER( MD2
|
||||||
MD2/MD2FileData.h
|
MD2/MD2FileData.h
|
||||||
MD2/MD2Loader.cpp
|
MD2/MD2Loader.cpp
|
||||||
|
@ -505,11 +480,6 @@ ADD_ASSIMP_IMPORTER( OBJ
|
||||||
Obj/ObjTools.h
|
Obj/ObjTools.h
|
||||||
)
|
)
|
||||||
|
|
||||||
ADD_ASSIMP_EXPORTER( OBJ
|
|
||||||
Obj/ObjExporter.h
|
|
||||||
Obj/ObjExporter.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
ADD_ASSIMP_IMPORTER( OGRE
|
ADD_ASSIMP_IMPORTER( OGRE
|
||||||
Ogre/OgreImporter.h
|
Ogre/OgreImporter.h
|
||||||
Ogre/OgreStructs.h
|
Ogre/OgreStructs.h
|
||||||
|
@ -529,11 +499,6 @@ ADD_ASSIMP_IMPORTER( OPENGEX
|
||||||
OpenGEX/OpenGEXStructs.h
|
OpenGEX/OpenGEXStructs.h
|
||||||
)
|
)
|
||||||
|
|
||||||
ADD_ASSIMP_EXPORTER( OPENGEX
|
|
||||||
OpenGEX/OpenGEXExporter.cpp
|
|
||||||
OpenGEX/OpenGEXExporter.h
|
|
||||||
)
|
|
||||||
|
|
||||||
ADD_ASSIMP_IMPORTER( PLY
|
ADD_ASSIMP_IMPORTER( PLY
|
||||||
Ply/PlyLoader.cpp
|
Ply/PlyLoader.cpp
|
||||||
Ply/PlyLoader.h
|
Ply/PlyLoader.h
|
||||||
|
@ -541,11 +506,6 @@ ADD_ASSIMP_IMPORTER( PLY
|
||||||
Ply/PlyParser.h
|
Ply/PlyParser.h
|
||||||
)
|
)
|
||||||
|
|
||||||
ADD_ASSIMP_EXPORTER( PLY
|
|
||||||
Ply/PlyExporter.cpp
|
|
||||||
Ply/PlyExporter.h
|
|
||||||
)
|
|
||||||
|
|
||||||
ADD_ASSIMP_IMPORTER( MS3D
|
ADD_ASSIMP_IMPORTER( MS3D
|
||||||
MS3D/MS3DLoader.cpp
|
MS3D/MS3DLoader.cpp
|
||||||
MS3D/MS3DLoader.h
|
MS3D/MS3DLoader.h
|
||||||
|
@ -635,14 +595,86 @@ ADD_ASSIMP_IMPORTER( FBX
|
||||||
FBX/FBXCommon.h
|
FBX/FBXCommon.h
|
||||||
)
|
)
|
||||||
|
|
||||||
ADD_ASSIMP_EXPORTER( FBX
|
if (NOT ASSIMP_NO_EXPORT)
|
||||||
FBX/FBXExporter.h
|
|
||||||
FBX/FBXExporter.cpp
|
ADD_ASSIMP_EXPORTER( OBJ
|
||||||
FBX/FBXExportNode.h
|
Obj/ObjExporter.h
|
||||||
FBX/FBXExportNode.cpp
|
Obj/ObjExporter.cpp)
|
||||||
FBX/FBXExportProperty.h
|
|
||||||
FBX/FBXExportProperty.cpp
|
ADD_ASSIMP_EXPORTER( OPENGEX
|
||||||
)
|
OpenGEX/OpenGEXExporter.cpp
|
||||||
|
OpenGEX/OpenGEXExporter.h)
|
||||||
|
|
||||||
|
ADD_ASSIMP_EXPORTER( PLY
|
||||||
|
Ply/PlyExporter.cpp
|
||||||
|
Ply/PlyExporter.h)
|
||||||
|
|
||||||
|
ADD_ASSIMP_EXPORTER( 3DS
|
||||||
|
3DS/3DSExporter.h
|
||||||
|
3DS/3DSExporter.cpp)
|
||||||
|
|
||||||
|
ADD_ASSIMP_EXPORTER( ASSBIN
|
||||||
|
Assbin/AssbinExporter.h
|
||||||
|
Assbin/AssbinExporter.cpp
|
||||||
|
Assbin/AssbinFileWriter.h
|
||||||
|
Assbin/AssbinFileWriter.cpp)
|
||||||
|
|
||||||
|
ADD_ASSIMP_EXPORTER( ASSXML
|
||||||
|
Assxml/AssxmlExporter.h
|
||||||
|
Assxml/AssxmlExporter.cpp
|
||||||
|
Assxml/AssxmlFileWriter.h
|
||||||
|
Assxml/AssxmlFileWriter.cpp)
|
||||||
|
|
||||||
|
ADD_ASSIMP_EXPORTER(M3D
|
||||||
|
M3D/M3DExporter.h
|
||||||
|
M3D/M3DExporter.cpp)
|
||||||
|
|
||||||
|
ADD_ASSIMP_EXPORTER(COLLADA
|
||||||
|
Collada/ColladaExporter.h
|
||||||
|
Collada/ColladaExporter.cpp)
|
||||||
|
|
||||||
|
ADD_ASSIMP_EXPORTER( FBX
|
||||||
|
FBX/FBXExporter.h
|
||||||
|
FBX/FBXExporter.cpp
|
||||||
|
FBX/FBXExportNode.h
|
||||||
|
FBX/FBXExportNode.cpp
|
||||||
|
FBX/FBXExportProperty.h
|
||||||
|
FBX/FBXExportProperty.cpp)
|
||||||
|
|
||||||
|
ADD_ASSIMP_EXPORTER( STL
|
||||||
|
STL/STLExporter.h
|
||||||
|
STL/STLExporter.cpp)
|
||||||
|
|
||||||
|
ADD_ASSIMP_EXPORTER( X
|
||||||
|
X/XFileExporter.h
|
||||||
|
X/XFileExporter.cpp)
|
||||||
|
|
||||||
|
ADD_ASSIMP_EXPORTER( X3D
|
||||||
|
X3D/X3DExporter.cpp
|
||||||
|
X3D/X3DExporter.hpp)
|
||||||
|
|
||||||
|
ADD_ASSIMP_EXPORTER( GLTF
|
||||||
|
glTF/glTFExporter.h
|
||||||
|
glTF/glTFExporter.cpp
|
||||||
|
glTF2/glTF2Exporter.h
|
||||||
|
glTF2/glTF2Exporter.cpp)
|
||||||
|
|
||||||
|
ADD_ASSIMP_EXPORTER( 3MF
|
||||||
|
3MF/D3MFExporter.h
|
||||||
|
3MF/D3MFExporter.cpp)
|
||||||
|
|
||||||
|
ADD_ASSIMP_EXPORTER( ASSJSON
|
||||||
|
Assjson/cencode.c
|
||||||
|
Assjson/cencode.h
|
||||||
|
Assjson/json_exporter.cpp
|
||||||
|
Assjson/mesh_splitter.cpp
|
||||||
|
Assjson/mesh_splitter.h)
|
||||||
|
|
||||||
|
ADD_ASSIMP_EXPORTER( STEP
|
||||||
|
Step/StepExporter.h
|
||||||
|
Step/StepExporter.cpp)
|
||||||
|
|
||||||
|
endif()
|
||||||
|
|
||||||
SET( PostProcessing_SRCS
|
SET( PostProcessing_SRCS
|
||||||
PostProcessing/CalcTangentsProcess.cpp
|
PostProcessing/CalcTangentsProcess.cpp
|
||||||
|
@ -744,11 +776,6 @@ ADD_ASSIMP_IMPORTER( STL
|
||||||
STL/STLLoader.h
|
STL/STLLoader.h
|
||||||
)
|
)
|
||||||
|
|
||||||
ADD_ASSIMP_EXPORTER( STL
|
|
||||||
STL/STLExporter.h
|
|
||||||
STL/STLExporter.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
ADD_ASSIMP_IMPORTER( TERRAGEN
|
ADD_ASSIMP_IMPORTER( TERRAGEN
|
||||||
Terragen/TerragenLoader.cpp
|
Terragen/TerragenLoader.cpp
|
||||||
Terragen/TerragenLoader.h
|
Terragen/TerragenLoader.h
|
||||||
|
@ -767,11 +794,6 @@ ADD_ASSIMP_IMPORTER( X
|
||||||
X/XFileParser.h
|
X/XFileParser.h
|
||||||
)
|
)
|
||||||
|
|
||||||
ADD_ASSIMP_EXPORTER( X
|
|
||||||
X/XFileExporter.h
|
|
||||||
X/XFileExporter.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
ADD_ASSIMP_IMPORTER( X3D
|
ADD_ASSIMP_IMPORTER( X3D
|
||||||
X3D/X3DImporter.cpp
|
X3D/X3DImporter.cpp
|
||||||
X3D/X3DImporter.hpp
|
X3D/X3DImporter.hpp
|
||||||
|
@ -792,11 +814,6 @@ ADD_ASSIMP_IMPORTER( X3D
|
||||||
X3D/X3DVocabulary.cpp
|
X3D/X3DVocabulary.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
ADD_ASSIMP_EXPORTER( X3D
|
|
||||||
X3D/X3DExporter.cpp
|
|
||||||
X3D/X3DExporter.hpp
|
|
||||||
)
|
|
||||||
|
|
||||||
ADD_ASSIMP_IMPORTER( GLTF
|
ADD_ASSIMP_IMPORTER( GLTF
|
||||||
glTF/glTFCommon.h
|
glTF/glTFCommon.h
|
||||||
glTF/glTFCommon.cpp
|
glTF/glTFCommon.cpp
|
||||||
|
@ -814,13 +831,6 @@ ADD_ASSIMP_IMPORTER( GLTF
|
||||||
glTF2/glTF2Importer.h
|
glTF2/glTF2Importer.h
|
||||||
)
|
)
|
||||||
|
|
||||||
ADD_ASSIMP_EXPORTER( GLTF
|
|
||||||
glTF/glTFExporter.h
|
|
||||||
glTF/glTFExporter.cpp
|
|
||||||
glTF2/glTF2Exporter.h
|
|
||||||
glTF2/glTF2Exporter.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
ADD_ASSIMP_IMPORTER( 3MF
|
ADD_ASSIMP_IMPORTER( 3MF
|
||||||
3MF/D3MFImporter.h
|
3MF/D3MFImporter.h
|
||||||
3MF/D3MFImporter.cpp
|
3MF/D3MFImporter.cpp
|
||||||
|
@ -829,11 +839,6 @@ ADD_ASSIMP_IMPORTER( 3MF
|
||||||
3MF/3MFXmlTags.h
|
3MF/3MFXmlTags.h
|
||||||
)
|
)
|
||||||
|
|
||||||
ADD_ASSIMP_EXPORTER( 3MF
|
|
||||||
3MF/D3MFExporter.h
|
|
||||||
3MF/D3MFExporter.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
ADD_ASSIMP_IMPORTER( MMD
|
ADD_ASSIMP_IMPORTER( MMD
|
||||||
MMD/MMDCpp14.h
|
MMD/MMDCpp14.h
|
||||||
MMD/MMDImporter.cpp
|
MMD/MMDImporter.cpp
|
||||||
|
@ -844,14 +849,6 @@ ADD_ASSIMP_IMPORTER( MMD
|
||||||
MMD/MMDVmdParser.h
|
MMD/MMDVmdParser.h
|
||||||
)
|
)
|
||||||
|
|
||||||
ADD_ASSIMP_EXPORTER( ASSJSON
|
|
||||||
Assjson/cencode.c
|
|
||||||
Assjson/cencode.h
|
|
||||||
Assjson/json_exporter.cpp
|
|
||||||
Assjson/mesh_splitter.cpp
|
|
||||||
Assjson/mesh_splitter.h
|
|
||||||
)
|
|
||||||
|
|
||||||
# Workaround for issue #2406 - force problematic large file to be optimized to prevent string table overflow error
|
# Workaround for issue #2406 - force problematic large file to be optimized to prevent string table overflow error
|
||||||
# Used -Os instead of -O2 as previous issues had mentioned, since -Os is roughly speaking -O2, excluding any
|
# Used -Os instead of -O2 as previous issues had mentioned, since -Os is roughly speaking -O2, excluding any
|
||||||
# optimizations that take up extra space. Given that the issue is a string table overflowing, -Os seemed appropriate
|
# optimizations that take up extra space. Given that the issue is a string table overflowing, -Os seemed appropriate
|
||||||
|
@ -874,11 +871,6 @@ ADD_ASSIMP_IMPORTER( STEP
|
||||||
Importer/StepFile/StepReaderGen.h
|
Importer/StepFile/StepReaderGen.h
|
||||||
)
|
)
|
||||||
|
|
||||||
ADD_ASSIMP_EXPORTER( STEP
|
|
||||||
Step/StepExporter.h
|
|
||||||
Step/StepExporter.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
if ((NOT ASSIMP_NO_EXPORT) OR (NOT ASSIMP_EXPORTERS_ENABLED STREQUAL ""))
|
if ((NOT ASSIMP_NO_EXPORT) OR (NOT ASSIMP_EXPORTERS_ENABLED STREQUAL ""))
|
||||||
SET( Exporter_SRCS
|
SET( Exporter_SRCS
|
||||||
Common/Exporter.cpp
|
Common/Exporter.cpp
|
||||||
|
@ -1088,8 +1080,10 @@ ENDIF()
|
||||||
MESSAGE(STATUS "Enabled importer formats:${ASSIMP_IMPORTERS_ENABLED}")
|
MESSAGE(STATUS "Enabled importer formats:${ASSIMP_IMPORTERS_ENABLED}")
|
||||||
MESSAGE(STATUS "Disabled importer formats:${ASSIMP_IMPORTERS_DISABLED}")
|
MESSAGE(STATUS "Disabled importer formats:${ASSIMP_IMPORTERS_DISABLED}")
|
||||||
|
|
||||||
MESSAGE(STATUS "Enabled exporter formats:${ASSIMP_EXPORTERS_ENABLED}")
|
if (NOT ASSIMP_NO_EXPORT)
|
||||||
MESSAGE(STATUS "Disabled exporter formats:${ASSIMP_EXPORTERS_DISABLED}")
|
MESSAGE(STATUS "Enabled exporter formats:${ASSIMP_EXPORTERS_ENABLED}")
|
||||||
|
MESSAGE(STATUS "Disabled exporter formats:${ASSIMP_EXPORTERS_DISABLED}")
|
||||||
|
endif()
|
||||||
|
|
||||||
SOURCE_GROUP( include\\assimp FILES ${PUBLIC_HEADERS} )
|
SOURCE_GROUP( include\\assimp FILES ${PUBLIC_HEADERS} )
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue