merge with/from trunk at r35190
[blender.git] / source / blender / collada / CMakeLists.txt
index 73e81025226bb522408d48723b35f182452b9fd6..3f8abb7ed5d306fbe55ba362c3757d3cef6f1248 100644 (file)
@@ -100,9 +100,17 @@ 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