merge with/from trunk at r35190
[blender.git] / source / blender / collada / CMakeLists.txt
index a72ecc4be6c823e3a76fe7d966702a28b89534e0..3f8abb7ed5d306fbe55ba362c3757d3cef6f1248 100644 (file)
 #
 # ***** END GPL LICENSE BLOCK *****
 
-FILE(GLOB SRC *.cpp)
+remove_strict_flags()
 
-IF(APPLE)
-SET(INC
-  .
-  ../blenlib
-  ../blenkernel
-  ../windowmanager
-  ../makesdna
-  ../makesrna
-  ../editors/include
-  ../../../intern/guardedalloc
-  ${OPENCOLLADA_INC}/COLLADAStreamWriter
-  ${OPENCOLLADA_INC}/COLLADABaseUtils
-  ${OPENCOLLADA_INC}/COLLADAFramework
-  ${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader 
+set(INC
+       .
+       ../blenlib
+       ../blenkernel
+       ../blenloader
+       ../windowmanager
+       ../makesdna
+       ../makesrna
+       ../editors/include
+       ../../../intern/guardedalloc
 )
 
-ELSE(APPLE)
+if(APPLE)
+       list(APPEND INC
+               ${OPENCOLLADA_INC}/COLLADAStreamWriter
+               ${OPENCOLLADA_INC}/COLLADABaseUtils
+               ${OPENCOLLADA_INC}/COLLADAFramework
+               ${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader 
+       )
+else()
+       list(APPEND INC
+               ${OPENCOLLADA_INC}/COLLADAStreamWriter/include
+               ${OPENCOLLADA_INC}/COLLADABaseUtils/include
+               ${OPENCOLLADA_INC}/COLLADAFramework/include
+               ${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader/include 
+       )
+endif()
 
-SET(INC
-  .
-  ../blenlib
-  ../blenkernel
-  ../windowmanager
-  ../makesdna
-  ../makesrna
-  ../editors/include
-  ../../../intern/guardedalloc
-  ${OPENCOLLADA_INC}/COLLADAStreamWriter/include
-  ${OPENCOLLADA_INC}/COLLADABaseUtils/include
-  ${OPENCOLLADA_INC}/COLLADAFramework/include
-  ${OPENCOLLADA_INC}/COLLADASaxFrameworkLoader/include 
+set(SRC
+       AnimationImporter.cpp
+       ArmatureExporter.cpp
+       ArmatureImporter.cpp
+       CameraExporter.cpp
+       DocumentExporter.cpp
+       DocumentImporter.cpp
+       EffectExporter.cpp
+       GeometryExporter.cpp
+       ImageExporter.cpp
+       InstanceWriter.cpp
+       LightExporter.cpp
+       MaterialExporter.cpp
+       MeshImporter.cpp
+       SkinInfo.cpp
+       TransformReader.cpp
+       TransformWriter.cpp
+       collada.cpp
+       collada_internal.cpp
+       collada_utils.cpp
+
+       AnimationImporter.h
+       ArmatureExporter.h
+       ArmatureImporter.h
+       CameraExporter.h
+       DocumentExporter.h
+       DocumentImporter.h
+       EffectExporter.h
+       GeometryExporter.h
+       ImageExporter.h
+       InstanceWriter.h
+       LightExporter.h
+       MaterialExporter.h
+       MeshImporter.h
+       SkinInfo.h
+       TransformReader.h
+       TransformWriter.h
+       collada.h
+       collada_internal.h
+       collada_utils.h
 )
 
-ENDIF(APPLE)
+if(WITH_BUILDINFO)
+       add_definitions(-DNAN_BUILDINFO)
+endif()
 
+<<<<<<< .working
 IF(WITH_BUILDINFO)
        ADD_DEFINITIONS(-DNAN_BUILDINFO)
 ENDIF(WITH_BUILDINFO)
 
 BLENDERLIB(bf_collada "${SRC}" "${INC}")
+=======
+if(CMAKE_COMPILER_IS_GNUCXX)
+       # COLLADAFWArray.h gives error with gcc 4.5
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
+endif()
+
+blender_add_lib(bf_collada "${SRC}" "${INC}")
+>>>>>>> .merge-right.r35190