Revision: 8783
http://playerstage.svn.sourceforge.net/playerstage/?rev=8783&view=rev
Author: natepak
Date: 2010-06-22 23:03:53 +0000 (Tue, 22 Jun 2010)
Log Message:
-----------
updates
Modified Paths:
--------------
code/gazebo/trunk/CMakeLists.txt
code/gazebo/trunk/gazebo.h.in
Added Paths:
-----------
code/gazebo/trunk/gazebo_config.h.in
Modified: code/gazebo/trunk/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/CMakeLists.txt 2010-06-22 23:02:52 UTC (rev 8782)
+++ code/gazebo/trunk/CMakeLists.txt 2010-06-22 23:03:53 UTC (rev 8783)
@@ -93,7 +93,8 @@
else (build_errors)
########################################
# Write the config.h file
- configure_file (${PROJECT_SOURCE_DIR}/config.h.in
${PROJECT_BINARY_DIR}/config.h)
+ configure_file (${PROJECT_SOURCE_DIR}/gazebo_config.h.in
${PROJECT_BINARY_DIR}/gazebo_config.h)
+ install(FILES ${PROJECT_BINARY_DIR}/gazebo_config.h DESTINATION
${CMAKE_INSTALL_PREFIX}/include/gazebo)
configure_file (${PROJECT_SOURCE_DIR}/gazebo.h.in
${PROJECT_BINARY_DIR}/gazebo.h)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gazebo.h DESTINATION
${CMAKE_INSTALL_PREFIX}/include/gazebo)
@@ -110,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/trunk/gazebo.h.in
===================================================================
--- code/gazebo/trunk/gazebo.h.in 2010-06-22 23:02:52 UTC (rev 8782)
+++ code/gazebo/trunk/gazebo.h.in 2010-06-22 23:03:53 UTC (rev 8783)
@@ -25,10 +25,5 @@
* SVN: $Id$
*/
-/* Version number */
-#define GAZEBO_MAJOR_VERSION ${GAZEBO_MAJOR_VERSION}
-#define GAZEBO_MINOR_VERSION ${GAZEBO_MINOR_VERSION}
-#define GAZEBO_PATCH_VERSION ${GAZEBO_PATCH_VERSION}
-#define GAZEBO_VERSION "${GAZEBO_VERSION}"
-
+#include <gazebo/gazebo_config.h>
#include <gazebo/gz.h>
Copied: code/gazebo/trunk/gazebo_config.h.in (from rev 8771,
code/gazebo/branches/simpar/gazebo_config.h.in)
===================================================================
--- code/gazebo/trunk/gazebo_config.h.in (rev 0)
+++ code/gazebo/trunk/gazebo_config.h.in 2010-06-22 23:03:53 UTC (rev
8783)
@@ -0,0 +1,18 @@
+/* config.h. Generated by CMake for @project_n...@. */
+
+/* Version number */
+#define GAZEBO_MAJOR_VERSION ${GAZEBO_MAJOR_VERSION}
+#define GAZEBO_MINOR_VERSION ${GAZEBO_MINOR_VERSION}
+#define GAZEBO_PATCH_VERSION ${GAZEBO_PATCH_VERSION}
+
+#define GAZEBO_VERSION "${GAZEBO_VERSION}"
+
+#cmakedefine HAVE_OPENAL 1
+#cmakedefine HAVE_FFMPEG 1
+#cmakedefine HAVE_LTDL 1
+#cmakedefine HAVE_DL 1
+#cmakedefine ENABLE_SHADOWS 1
+#cmakedefine INCLUDE_BULLET 1
+#cmakedefine INCLUDE_ODE 1
+#cmakedefine INCLUDE_ODE_JOINT_DAMPING 1
+#cmakedefine INCLUDE_RTSHADER 1
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
