Merge remote-tracking branch 'upstream/master'

2016-06-08 16:16:48 +02:00
parent 075de21af1 656649084d
commit 09badeb19c
164 changed files with 550 additions and 426 deletions
--- a/src/osgPlugins/dae/CMakeLists.txt
+++ b/src/osgPlugins/dae/CMakeLists.txt
@@ -1,5 +1,15 @@
 INCLUDE_DIRECTORIES( ${COLLADA_INCLUDE_DIR} ${COLLADA_INCLUDE_DIR}/1.4)

+
+################################################################################
+## Quieten warnings that a due to dae headers
+
+IF(CMAKE_COMPILER_IS_GNUCXX)
+    # Remove -Wextra flag as it barfs on ffmoeg headers
+   STRING(REGEX REPLACE "-Wextra" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+ENDIF()
+
+
 SET(TARGET_SRC
    daeReader.cpp
    daeRAnimations.cpp