bkinnightskytw
/
kdl_parser
mirror of https://github.com/existedinnettw/kdl_parser.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade assimp to svn rev 811 -- this includes some fixes for collada loading as well as uri syntax

This commit is contained in:
jfaust 2010-08-31 18:51:05 +00:00
parent 2cac8c6027
commit 84dee09786
2 changed files with 42 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assimp/Makefile
View File

@ -2,7 +2,7 @@ all: installed
PACKAGE_NAME=`rospack find assimp` PACKAGE_NAME=`rospack find assimp`
# Regular download # Regular download
TARBALL_NAME = assimp-1.1.700 TARBALL_NAME = assimp-svn-811
TARBALL = build/$(TARBALL_NAME).tar.gz TARBALL = build/$(TARBALL_NAME).tar.gz
TARBALL_URL = http://pr.willowgarage.com/downloads/$(TARBALL_NAME).tar.gz TARBALL_URL = http://pr.willowgarage.com/downloads/$(TARBALL_NAME).tar.gz
TARBALL_PATCH = assimp.patch TARBALL_PATCH = assimp.patch

87
assimp/assimp.patch
View File

@ -1,61 +1,56 @@
--- CMakeLists.txt.old 2010-05-21 11:08:29.598051070 -0700 Index: code/CMakeLists.txt
+++ CMakeLists.txt 2010-05-21 11:19:28.595500290 -0700 ===================================================================
@@ -20,6 +20,21 @@ SET( INCLUDE_INSTALL_DIR "${CMAKE_INSTAL --- code/CMakeLists.txt (revision 811)
SET( BIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH +++ code/CMakeLists.txt (working copy)
"Path the tool executables are installed to." ) @@ -742,6 +742,8 @@
SOVERSION ${LIBRARY_SOVERSION}
)
+target_link_libraries(assimp ${boost_libraries})
+
INSTALL( TARGETS assimp DESTINATION ${LIB_INSTALL_DIR} )
INSTALL( FILES ${PUBLIC_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/assimp )
INSTALL( FILES ${COMPILER_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/assimp/Compiler )
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt (revision 811)
+++ CMakeLists.txt (working copy)
@@ -25,26 +25,21 @@
CONFIGURE_FILE( "${CMAKE_SOURCE_DIR}/assimp.pc.in" "${CMAKE_BINARY_DIR}/assimp.pc" @ONLY )
INSTALL( FILES "${CMAKE_BINARY_DIR}/assimp.pc" DESTINATION ${LIB_INSTALL_DIR}/pkgconfig/ )
-# Globally enbale Boost resp. the Boost workaround – it is also needed by the
-# tools which include the Assimp headers.
-IF ( ENABLE_BOOST_WORKAROUND )
- INCLUDE_DIRECTORIES( BoostWorkaround )
- ADD_DEFINITIONS( -DASSIMP_BUILD_BOOST_WORKAROUND )
- MESSAGE( STATUS "Building a non-boost version of Assimp." )
-ELSE ( ENABLE_BOOST_WORKAROUND )
- FIND_PACKAGE( Boost 1.35 )
+SET (boost_include_dirs "" CACHE STRING "Boost include paths. Use this to override automatic detection.") +SET (boost_include_dirs "" CACHE STRING "Boost include paths. Use this to override automatic detection.")
+SET (boost_library_dirs "" CACHE STRING "Boost library paths. Use this to override automatic detection.") +SET (boost_library_dirs "" CACHE STRING "Boost library paths. Use this to override automatic detection.")
+SET (boost_libraries "" CACHE STRING "Boost libraries. Use this to override automatic detection.") +SET (boost_libraries "" CACHE STRING "Boost libraries. Use this to override automatic detection.")
+
+ - IF ( NOT Boost_FOUND )
- MESSAGE( FATAL_ERROR
- "Boost libraries (http://www.boost.org/) not found. "
- "You can build a non-boost version of Assimp with slightly reduced "
- "functionality by specifying -DENABLE_BOOST_WORKAROUND=ON."
- )
- ENDIF ( NOT Boost_FOUND )
- INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIRS} )
-ENDIF ( ENABLE_BOOST_WORKAROUND )
+message(status " debug: ${boost_include_dirs} ${boost_libraries}" ) +message(status " debug: ${boost_include_dirs} ${boost_libraries}" )
+INCLUDE_DIRECTORIES( +INCLUDE_DIRECTORIES(
+ include + include
+ ${boost_include_dirs} + ${boost_include_dirs}
+) +)
+
+LINK_DIRECTORIES( +LINK_DIRECTORIES(
+ ${boost_library_dirs} + ${boost_library_dirs}
+) +)
+ +
# Libs
ADD_SUBDIRECTORY( code/ ) ADD_SUBDIRECTORY( code/ )
IF ( WIN32 ) IF ( WIN32 )
--- code/CMakeLists.txt.old 2010-05-21 11:25:22.057223769 -0700 ADD_SUBDIRECTORY( test/ )
+++ code/CMakeLists.txt 2010-05-21 11:25:47.295533481 -0700
@@ -1,25 +1,6 @@
SET( LIBRARY_VERSION "1.0.0" )
SET( LIBRARY_SOVERSION "1" )
-IF ( ENABLE_BOOST_WORKAROUND )
- INCLUDE_DIRECTORIES( BoostWorkaround )
- ADD_DEFINITIONS( -DASSIMP_BUILD_BOOST_WORKAROUND )
- MESSAGE( STATUS "Building a non-boost version of Assimp." )
-ELSE ( ENABLE_BOOST_WORKAROUND )
- FIND_PACKAGE( Boost 1.35 )
-
- IF ( NOT Boost_FOUND )
- MESSAGE( FATAL_ERROR
- "Boost libraries (http://www.boost.org/) not found. "
- "You can build a non-boost version of Assimp with slightly reduced "
- "functionality by specifying -DENABLE_BOOST_WORKAROUND=ON."
- )
- ENDIF ( NOT Boost_FOUND )
-
- INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIRS} )
-ENDIF ( ENABLE_BOOST_WORKAROUND )
-
-
#
# Listing and grouping of all the source files for use with IDE project
# generators.
@@ -691,6 +672,8 @@ ADD_LIBRARY( assimp SHARED
${COMPILER_HEADERS}
)
+TARGET_LINK_LIBRARIES( assimp ${boost_libraries})
+
ADD_DEFINITIONS( -DASSIMP_BUILD_DLL_EXPORT )
if ( WIN32 )