mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-22 17:20:06 +08:00
77 lines
2.4 KiB
Diff
77 lines
2.4 KiB
Diff
|
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)
|