FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2.8 branch: Improvements for building COLLADA. CMake only, does not change the actual COLLADA plugin (it's same as 2.8.2). Merged in this commit: r9759, r9952, r10336, r10626, and r10637.

Browse Source
This commit is contained in:
Paul MARTZ
2010-04-01 21:29:09 +00:00
parent 01b510865f
commit dab855f141
2 changed files with 125 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/osgPlugins/dae/CMakeLists.txt
View File

@@ -1,8 +1,4 @@
IF (WIN32)
INCLUDE_DIRECTORIES( ${COLLADA_INCLUDE_DIR} ${COLLADA_INCLUDE_DIR}/1.4 ${COLLADA_BOOST_INCLUDE_DIR} )
ELSE (WIN32)
INCLUDE_DIRECTORIES( ${COLLADA_INCLUDE_DIR} ${COLLADA_INCLUDE_DIR}/1.4)
ENDIF (WIN32)
INCLUDE_DIRECTORIES( ${COLLADA_INCLUDE_DIR} ${COLLADA_INCLUDE_DIR}/1.4)
SET(TARGET_SRC
daeReader.cpp
@@ -23,40 +19,54 @@ SET(TARGET_H
daeReader.h
daeWriter.h
domSourceReader.h
ReaderWriterDAE.h
)
IF (COLLADA_DYNAMIC_LIBRARY AND COLLADA_STATIC_LIBRARY)
IF(COLLADA_DYNAMIC_LIBRARY AND COLLADA_STATIC_LIBRARY)
OPTION(COLLADA_USE_STATIC "Set to ON to build OpenSceneGraph with static Collada support." OFF)
ELSEIF(COLLADA_STATIC_LIBRARY)
SET(COLLADA_USE_STATIC "YES")
ELSE()
SET(COLLADA_USE_STATIC "NO")
ENDIF()
ELSE(COLLADA_DYNAMIC_LIBRARY AND COLLADA_STATIC_LIBRARY)
ADD_DEFINITIONS(-DNO_BOOST)
IF (COLLADA_STATIC_LIBRARY)
SET(COLLADA_USE_STATIC "YES")
ELSE(COLLADA_STATIC_LIBRARY)
SET(COLLADA_USE_STATIC "NO")
ENDIF(COLLADA_STATIC_LIBRARY)
ENDIF(COLLADA_DYNAMIC_LIBRARY AND COLLADA_STATIC_LIBRARY)
IF (COLLADA_USE_STATIC)
IF(COLLADA_USE_STATIC)
IF(WIN32)
ADD_DEFINITIONS(-DBOOST_ALL_NO_LIB)
SET(TARGET_LIBRARIES_VARS COLLADA_STATIC_LIBRARY COLLADA_LIBXML_LIBRARY COLLADA_ZLIB_LIBRARY COLLADA_PCRECPP_LIBRARY COLLADA_PCRE_LIBRARY COLLADA_MINIZIP_LIBRARY COLLADA_BOOST_FILESYSTEM_LIBRARY COLLADA_BOOST_SYSTEM_LIBRARY)
ELSE(WIN32)
SET(TARGET_LIBRARIES_VARS COLLADA_STATIC_LIBRARY COLLADA_LIBXML_LIBRARY COLLADA_PCRECPP_LIBRARY COLLADA_BOOST_FILESYSTEM_LIBRARY COLLADA_BOOST_SYSTEM_LIBRARY)
ENDIF(WIN32)
ELSE (COLLADA_USE_STATIC)
SET(TARGET_LIBRARIES_VARS
COLLADA_STATIC_LIBRARY
COLLADA_LIBXML_LIBRARY
COLLADA_ZLIB_LIBRARY
COLLADA_PCRECPP_LIBRARY
COLLADA_PCRE_LIBRARY
COLLADA_MINIZIP_LIBRARY
COLLADA_BOOST_FILESYSTEM_LIBRARY
COLLADA_BOOST_SYSTEM_LIBRARY)
ELSE()
SET(TARGET_LIBRARIES_VARS
COLLADA_STATIC_LIBRARY
COLLADA_LIBXML_LIBRARY
COLLADA_PCRECPP_LIBRARY
COLLADA_PCRE_LIBRARY
COLLADA_BOOST_FILESYSTEM_LIBRARY
COLLADA_BOOST_SYSTEM_LIBRARY)
ENDIF()
ELSE()
IF(WIN32)
ADD_DEFINITIONS(-DDOM_DYNAMIC -DBOOST_ALL_NO_LIB)
SET(TARGET_LIBRARIES_VARS COLLADA_DYNAMIC_LIBRARY COLLADA_BOOST_SYSTEM_LIBRARY)
ELSE(WIN32)
ADD_DEFINITIONS(-DDOM_DYNAMIC)
SET(TARGET_LIBRARIES_VARS COLLADA_DYNAMIC_LIBRARY)
ENDIF(WIN32)
ENDIF(COLLADA_USE_STATIC)
ELSE()
SET(TARGET_LIBRARIES_VARS
COLLADA_DYNAMIC_LIBRARY
COLLADA_BOOST_FILESYSTEM_LIBRARY)
ENDIF()
ENDIF()
SET(TARGET_ADDED_LIBRARIES osgSim )
SET(TARGET_ADDED_LIBRARIES osgSim osgAnimation)
#### end var setup ###
SETUP_PLUGIN(dae dae)