Revision: 8621
http://playerstage.svn.sourceforge.net/playerstage/?rev=8621&view=rev
Author: natepak
Date: 2010-04-24 19:38:14 +0000 (Sat, 24 Apr 2010)
Log Message:
-----------
Fixed a mistake
Modified Paths:
--------------
code/gazebo/trunk/server/CMakeLists.txt
Modified: code/gazebo/trunk/server/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/CMakeLists.txt 2010-04-24 17:42:52 UTC (rev
8620)
+++ code/gazebo/trunk/server/CMakeLists.txt 2010-04-24 19:38:14 UTC (rev
8621)
@@ -2,21 +2,15 @@
########################################
# Include all the search paths for headers
-#STRING (REPLACE " " ";" boost_include_dirs_split "${boost_include_dirs}")
-#STRING (REPLACE " " ";" assimp_include_dirs_split "${assimp_include_dirs}")
-#STRING (REPLACE " " ";" bullet_include_dirs_split "${bullet_include_dirs}")
-#STRING (REPLACE " " ";" threadpool_include_dirs_split
"${threadpool_include_dirs}")
-#STRING (REPLACE " " ";" boost_library_dirs_split "${boost_library_dirs}")
-#STRING (REPLACE " " ";" assimp_library_dirs_split "${assimp_library_dirs}")
-#STRING (REPLACE " " ";" bullet_library_dirs_split "${bullet_library_dirs}")
+STRING (REPLACE " " ";" boost_include_dirs_split "${boost_include_dirs}")
+STRING (REPLACE " " ";" assimp_include_dirs_split "${assimp_include_dirs}")
+STRING (REPLACE " " ";" bullet_include_dirs_split "${bullet_include_dirs}")
+STRING (REPLACE " " ";" threadpool_include_dirs_split
"${threadpool_include_dirs}")
+STRING (REPLACE " " ";" boost_library_dirs_split "${boost_library_dirs}")
+STRING (REPLACE " " ";" assimp_library_dirs_split "${assimp_library_dirs}")
+STRING (REPLACE " " ";" bullet_library_dirs_split "${bullet_library_dirs}")
-APPEND_TO_CACHED_LIST(gazeboserver_ldflags
- ${gazeboserver_ldflags_desc}
- -lassimp -lgazebo_physics -lgazebo_physics_ode
-lgazebo_av -lgazebo_gui -lgazebo_rendering)
-STRING (REPLACE ";" " " gazeboserver_ldflags "${gazeboserver_ldflags}")
-message(STATUS "SERVER LDFLAGS ${gazeboserver_ldflags}")
-
INCLUDE_DIRECTORIES(
.
${CMAKE_SOURCE_DIR}/libgazebo
@@ -170,25 +164,33 @@
gazebo
assimp
)
+APPEND_TO_CACHED_LIST(gazeboserver_ldflags
+ ${gazeboserver_ldflags_desc}
+ -lassimp -lgazebo_physics -lgazebo_av -lgazebo_gui
+ -lgazebo_rendering)
target_link_libraries( gazebo_server ${libtool_library} ${freeimage_library}
gazebo gazebo_rendering gazebo_physics )
if (INCLUDE_BULLET)
- #target_link_libraries(gazebo_server ${bullet_lflags} gazebo_physics_bullet )
- #target_link_libraries(gazebo-exec ${bullet_lflags} gazebo_physics_bullet )
-
- #string (REPLACE " " ";" bullet_lflags_split "${bullet_lflags}")
target_link_libraries(gazebo_server ${bullet_lflags} gazebo_physics_bullet )
target_link_libraries(gazebo-exec ${bullet_lflags} gazebo_physics_bullet )
+
+ APPEND_TO_CACHED_LIST(gazeboserver_ldflags
+ ${gazeboserver_ldflags_desc}
+ -lgazebo_physics_bullet)
endif (INCLUDE_BULLET)
if (INCLUDE_ODE)
target_link_libraries(gazebo_server gazebo_physics_ode ${ODE_LIBRARIES})
target_link_libraries(gazebo-exec gazebo_physics_ode ${ODE_LIBRARIES})
+ APPEND_TO_CACHED_LIST(gazeboserver_ldflags
+ ${gazeboserver_ldflags_desc}
+ -lgazebo_physics_ode)
endif (INCLUDE_ODE)
+STRING (REPLACE ";" " " gazeboserver_ldflags "${gazeboserver_ldflags}")
configure_file(${CMAKE_SOURCE_DIR}/cmake/gazeboserver_pkgconfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/gazeboserver.pc @ONLY)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gazeboserver.pc DESTINATION
${CMAKE_INSTALL_PREFIX}/lib/pkgconfig COMPONENT pkgconfig)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
