Revision: 8764
http://playerstage.svn.sourceforge.net/playerstage/?rev=8764&view=rev
Author: natepak
Date: 2010-06-14 15:02:52 +0000 (Mon, 14 Jun 2010)
Log Message:
-----------
Removed internal assimp
Modified Paths:
--------------
code/gazebo/branches/simpar/CMakeLists.txt
code/gazebo/branches/simpar/cmake/SearchForStuff.cmake
Removed Paths:
-------------
code/gazebo/branches/simpar/3rd_party/
Modified: code/gazebo/branches/simpar/CMakeLists.txt
===================================================================
--- code/gazebo/branches/simpar/CMakeLists.txt 2010-06-14 14:49:04 UTC (rev
8763)
+++ code/gazebo/branches/simpar/CMakeLists.txt 2010-06-14 15:02:52 UTC (rev
8764)
@@ -111,10 +111,6 @@
if (BUILD_GAZEBO)
include (libgazebo)
- if (use_internal_assimp)
- add_subdirectory(3rd_party)
- endif (use_internal_assimp)
-
add_subdirectory(libgazebo)
add_subdirectory(server)
add_subdirectory(worlds)
Modified: code/gazebo/branches/simpar/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/branches/simpar/cmake/SearchForStuff.cmake 2010-06-14
14:49:04 UTC (rev 8763)
+++ code/gazebo/branches/simpar/cmake/SearchForStuff.cmake 2010-06-14
15:02:52 UTC (rev 8764)
@@ -4,8 +4,6 @@
# John - ode version with joint damping
SET(ODE_JOINT_DAMPING_VERSION 0.11.1.1 CACHE INTERNAL "ODE version with joint
damping" FORCE)
-set (use_internal_assimp OFF CACHE BOOL "Use internal assimp" FORCE)
-
set (INCLUDE_WEBGAZEBO ON CACHE BOOL "Build webgazebo" FORCE)
set (OGRE_LIBRARY_PATH "/usr/local/lib" CACHE INTERNAL "Ogre library path")
@@ -480,18 +478,15 @@
find_library(assimp_library assimp ENV LD_LIBRARY_PATH)
- if (NOT assimp_library)
- message (STATUS "Looking for libassimp - not found. Using builtin
version.")
- #BUILD_ERROR("libassimp not found. See the following website for
installation instructions: http://assimp.sourceforge.net";)
- else (NOT assimp_library)
+ if (assimp_library)
message (STATUS "Looking for libassimp - found")
APPEND_TO_CACHED_LIST(assimp_libraries
"Assimp libraries Use this to override automatic
detection."
${assimp_library})
- endif (NOT assimp_library)
+ endif (assimp_library)
if (NOT assimp_include_dir OR NOT assimp_library)
- set (use_internal_assimp ON CACHE BOOL "Use internal assimp" FORCE)
+ BUILD_ERROR("assimp not found. See the following website for installation
instructions: http://assimp.sourceforge.net";)
endif (NOT assimp_include_dir OR NOT assimp_library)
endif (NOT assimp_include_dirs AND NOT assimp_library_dirs AND NOT
assimp_libraries )
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
