diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-02-27 11:56:29 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-02-27 11:56:29 -0800 |
| commit | 2cc7fa27e57f1129d1f37ccb009563509ca25720 (patch) | |
| tree | 3c75e423b71e54f6f65ec085c5d3d190d9d0d1a9 /ports/osg/collada.patch | |
| parent | 3830517ec7519b823f5d8c404710889c6bd00278 (diff) | |
| parent | 2dfa568d186e4f0d199040929f9b3e44f27c8943 (diff) | |
| download | vcpkg-2cc7fa27e57f1129d1f37ccb009563509ca25720.tar.gz vcpkg-2cc7fa27e57f1129d1f37ccb009563509ca25720.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/5254
Diffstat (limited to 'ports/osg/collada.patch')
| -rw-r--r-- | ports/osg/collada.patch | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/ports/osg/collada.patch b/ports/osg/collada.patch new file mode 100644 index 000000000..7c856c86d --- /dev/null +++ b/ports/osg/collada.patch @@ -0,0 +1,76 @@ +diff --git a/CMakeModules/FindCOLLADA.cmake b/CMakeModules/FindCOLLADA.cmake
+index 8c9c2fc33..6a8ab04ca 100644
+--- a/CMakeModules/FindCOLLADA.cmake
++++ b/CMakeModules/FindCOLLADA.cmake
+@@ -25,11 +25,11 @@ ENDIF()
+
+ IF(APPLE)
+ SET(COLLADA_BUILDNAME "mac")
+- SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME})
++ SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME})
+ ELSEIF(MINGW)
+ SET(COLLADA_BUILDNAME "mingw")
+- SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME})
+-ELSEIF(MSVC_VERSION EQUAL 1900 OR MSVC_VERSION EQUAL 1910 )
++ SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME})
++ELSEIF(MSVC_VERSION GREATER_EQUAL 1900 )
+ SET(COLLADA_BUILDNAME "vc14")
+ SET(COLLADA_BOOST_BUILDNAME "vc140")
+ ELSEIF(MSVC_VERSION EQUAL 1800)
+@@ -58,6 +58,7 @@ ENDIF()
+
+
+ FIND_PATH(COLLADA_INCLUDE_DIR dae.h
++ PATHS
+ ${COLLADA_DOM_ROOT}/include
+ $ENV{COLLADA_DIR}/include
+ $ENV{COLLADA_DIR}
+@@ -65,27 +66,19 @@ FIND_PATH(COLLADA_INCLUDE_DIR dae.h
+ /Library/Frameworks
+ /opt/local/Library/Frameworks #macports
+ /usr/local/include
+- /usr/local/include/colladadom
+- /usr/local/include/collada-dom
+- /usr/local/include/collada-dom2.5
+- /usr/local/include/collada-dom2.4
+- /usr/local/include/collada-dom2.2
+- /opt/local/include/collada-dom
+- /opt/local/include/collada-dom2.5
+- /opt/local/include/collada-dom2.4
+- /opt/local/include/collada-dom2.2
+ /usr/include/
+- /usr/include/colladadom
+- /usr/include/collada-dom
+- /usr/include/collada-dom2.5
+- /usr/include/collada-dom2.4
+- /usr/include/collada-dom2.2
+ /sw/include # Fink
+ /opt/local/include # DarwinPorts
+ /opt/csw/include # Blastwave
+ /opt/include
+ /usr/freeware/include
+ ${ACTUAL_3DPARTY_DIR}/include
++ PATH_SUFFIXES
++ colladadom
++ collada-dom
++ collada-dom2.5
++ collada-dom2.4
++ collada-dom2.2
+ )
+
+ FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY
+diff --git a/src/osgPlugins/dae/CMakeLists.txt b/src/osgPlugins/dae/CMakeLists.txt
+index af03fb866..7eadfc2f3 100644
+--- a/src/osgPlugins/dae/CMakeLists.txt
++++ b/src/osgPlugins/dae/CMakeLists.txt
+@@ -49,7 +49,9 @@ ELSE()
+ ENDIF()
+
+ ADD_DEFINITIONS(-DNO_BOOST)
+-ADD_DEFINITIONS(-DCOLLADA_DOM_SUPPORT141)
++ADD_DEFINITIONS(-DCOLLADA_DOM_USING_141
++ -DCOLLADA_DOM_SUPPORT141
++ -DCOLLADA_DOM_SUPPORT150)
+
+ IF (COLLADA_DOM_2_4_OR_LATER)
+ ADD_DEFINITIONS(-DCOLLADA_DOM_2_4_OR_LATER)
|