Revision: 8529
http://playerstage.svn.sourceforge.net/playerstage/?rev=8529&view=rev
Author: natepak
Date: 2010-01-26 21:56:00 +0000 (Tue, 26 Jan 2010)
Log Message:
-----------
Fixed up searching for assimp includes
Modified Paths:
--------------
code/gazebo/trunk/cmake/SearchForStuff.cmake
code/gazebo/trunk/server/AssimpLoader.hh
Modified: code/gazebo/trunk/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/trunk/cmake/SearchForStuff.cmake 2010-01-26 01:35:24 UTC
(rev 8528)
+++ code/gazebo/trunk/cmake/SearchForStuff.cmake 2010-01-26 21:56:00 UTC
(rev 8529)
@@ -347,15 +347,15 @@
# Find assimp
if (NOT assimp_include_dirs AND NOT assimp_library_dirs AND NOT
assimp_libraries )
- find_path(assimp_include_dir assimp.hpp ${assimp_include_dirs} ENV CPATH)
+ find_path(assimp_include_dir assimp/assimp.hpp ${assimp_include_dirs} ENV
CPATH)
if (NOT assimp_include_dir)
#BUILD_ERROR("assimp not found. See the following website for installation
instructions: http://assimp.sourceforge.net";)
- message (STATUS "Looking for assimp.hpp - not found. Using built in
version.")
+ message (STATUS "Looking for assimp/assimp.hpp - not found. Using built in
version.")
set (assimp_include_dirs /usr/include CACHE STRING
"Assimp include paths. Use this to override automatic detection.")
else (NOT assimp_include_dir)
- message (STATUS "Looking for assimp.hpp - found")
+ message (STATUS "Looking for assimp/assimp.hpp - found")
set (assim_include_dirs ${assimp_include_dir} CACHE STRING
"Assimp include paths. Use this to override automatic detection.")
endif (NOT assimp_include_dir)
Modified: code/gazebo/trunk/server/AssimpLoader.hh
===================================================================
--- code/gazebo/trunk/server/AssimpLoader.hh 2010-01-26 01:35:24 UTC (rev
8528)
+++ code/gazebo/trunk/server/AssimpLoader.hh 2010-01-26 21:56:00 UTC (rev
8529)
@@ -3,9 +3,9 @@
#include <string>
-#include <assimp.hpp>
-#include <aiScene.h>
-#include <aiPostProcess.h>
+#include <assimp/assimp.hpp>
+#include <assimp/aiScene.h>
+#include <assimp/aiPostProcess.h>
#include "MeshLoader.hh"
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
