Revision: 8996
http://playerstage.svn.sourceforge.net/playerstage/?rev=8996&view=rev
Author: hsujohnhsu
Date: 2010-12-02 07:21:25 +0000 (Thu, 02 Dec 2010)
Log Message:
-----------
fix so compiles without libprofiler.so
Modified Paths:
--------------
code/gazebo/branches/wg/cmake/SearchForStuff.cmake
code/gazebo/branches/wg/libgazebo/CMakeLists.txt
code/gazebo/branches/wg/server/CMakeLists.txt
code/gazebo/branches/wg/server/audio_video/CMakeLists.txt
code/gazebo/branches/wg/server/physics/CMakeLists.txt
code/gazebo/branches/wg/server/rendering/CMakeLists.txt
code/gazebo/branches/wg/server/wx/CMakeLists.txt
Modified: code/gazebo/branches/wg/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/branches/wg/cmake/SearchForStuff.cmake 2010-12-02 05:58:12 UTC
(rev 8995)
+++ code/gazebo/branches/wg/cmake/SearchForStuff.cmake 2010-12-02 07:21:25 UTC
(rev 8996)
@@ -443,6 +443,9 @@
IF (PROFILER)
SET (CMAKE_LINK_FLAGS_PROFILE "${CMAKE_LINK_FLAGS_PROFILE} -lprofiler"
CACHE INTERNAL "Link flags for profile" FORCE)
+ SET (USE_PROFILER ON CACHE BOOL "Found profiler" FORCE)
+ELSE (PROFILER)
+ SET (USE_PROFILER OFF CACHE BOOL "Did not found profiler" FORCE)
ENDIF (PROFILER)
########################################
Modified: code/gazebo/branches/wg/libgazebo/CMakeLists.txt
===================================================================
--- code/gazebo/branches/wg/libgazebo/CMakeLists.txt 2010-12-02 05:58:12 UTC
(rev 8995)
+++ code/gazebo/branches/wg/libgazebo/CMakeLists.txt 2010-12-02 07:21:25 UTC
(rev 8996)
@@ -27,9 +27,12 @@
${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
endif (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
+IF (USE_PROFILER)
+ target_link_libraries( gazeboshm ${boost_libraries} profiler)
+ELSE (USE_PROFILER)
+ target_link_libraries( gazeboshm ${boost_libraries})
+ENDIF (USE_PROFILER)
-target_link_libraries( gazeboshm ${boost_libraries} profiler)
-
install (TARGETS gazeboshm DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
install (FILES ${headers} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/gazebo)
Modified: code/gazebo/branches/wg/server/CMakeLists.txt
===================================================================
--- code/gazebo/branches/wg/server/CMakeLists.txt 2010-12-02 05:58:12 UTC
(rev 8995)
+++ code/gazebo/branches/wg/server/CMakeLists.txt 2010-12-02 07:21:25 UTC
(rev 8996)
@@ -187,7 +187,6 @@
gazeboshm
assimp
pthread
- profiler
)
APPEND_TO_CACHED_LIST(gazeboserver_ldflags
@@ -195,7 +194,12 @@
-lassimp -lgazebo_physics -lgazebo_av -lgazebo_wx
-lgazebo_rendering)
-target_link_libraries( gazebo_server ${libtool_library} ${freeimage_library}
gazeboshm gazebo_rendering gazebo_physics profiler)
+IF (USE_PROFILER)
+ target_link_libraries( gazebo-exec ${libtool_library} profiler)
+ target_link_libraries( gazebo_server ${libtool_library} ${freeimage_library}
gazeboshm gazebo_rendering gazebo_physics profiler)
+ELSE (USE_PROFILER)
+ target_link_libraries( gazebo_server ${libtool_library} ${freeimage_library}
gazeboshm gazebo_rendering gazebo_physics)
+ENDIF (USE_PROFILER)
if (INCLUDE_BULLET)
target_link_libraries(gazebo_server ${bullet_lflags} gazebo_physics_bullet )
Modified: code/gazebo/branches/wg/server/audio_video/CMakeLists.txt
===================================================================
--- code/gazebo/branches/wg/server/audio_video/CMakeLists.txt 2010-12-02
05:58:12 UTC (rev 8995)
+++ code/gazebo/branches/wg/server/audio_video/CMakeLists.txt 2010-12-02
07:21:25 UTC (rev 8996)
@@ -27,7 +27,11 @@
#TARGET_LINK_LIBRARIES(gazebo_av ${OAL_LIBRARIES} ${AVC_LIBRARIES}
${AVF_LIBRARIES})
-target_link_libraries(gazebo_av-shared ${OAL_LIBRARIES} ${AVC_LIBRARIES}
${AVF_LIBRARIES} profiler)
+IF (USE_PROFILER)
+ target_link_libraries(gazebo_av-shared ${OAL_LIBRARIES} ${AVC_LIBRARIES}
${AVF_LIBRARIES} profiler)
+ELSE (USE_PROFILER)
+ target_link_libraries(gazebo_av-shared ${OAL_LIBRARIES} ${AVC_LIBRARIES}
${AVF_LIBRARIES})
+ENDIF (USE_PROFILER)
#SET_TARGET_PROPERTIES(gazebo_av PROPERTIES OUTPUT_NAME "gazebo_av")
set_target_properties(gazebo_av-shared PROPERTIES OUTPUT_NAME "gazebo_av"
VERSION ${GAZEBO_VERSION})
Modified: code/gazebo/branches/wg/server/physics/CMakeLists.txt
===================================================================
--- code/gazebo/branches/wg/server/physics/CMakeLists.txt 2010-12-02
05:58:12 UTC (rev 8995)
+++ code/gazebo/branches/wg/server/physics/CMakeLists.txt 2010-12-02
07:21:25 UTC (rev 8996)
@@ -75,7 +75,11 @@
set_target_properties(gazebo_physics PROPERTIES LINK_FLAGS
${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}} ${parallel_quickstep_lflags})
endif (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
-target_link_libraries(gazebo_physics profiler)
+IF (USE_PROFILER)
+ target_link_libraries(gazebo_physics profiler)
+ELSE (USE_PROFILER)
+ target_link_libraries(gazebo_physics)
+ENDIF (USE_PROFILER)
install ( TARGETS gazebo_physics DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
#APPEND_TO_SERVER_SOURCES(${sources})
Modified: code/gazebo/branches/wg/server/rendering/CMakeLists.txt
===================================================================
--- code/gazebo/branches/wg/server/rendering/CMakeLists.txt 2010-12-02
05:58:12 UTC (rev 8995)
+++ code/gazebo/branches/wg/server/rendering/CMakeLists.txt 2010-12-02
07:21:25 UTC (rev 8996)
@@ -66,6 +66,10 @@
${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
endif (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
-target_link_libraries( gazebo_rendering ${OGRE_LIBRARIES} X11 glut profiler)
+IF (USE_PROFILER)
+ target_link_libraries( gazebo_rendering ${OGRE_LIBRARIES} X11 glut profiler)
+ELSE (USE_PROFILER)
+ target_link_libraries( gazebo_rendering ${OGRE_LIBRARIES} X11 glut)
+ENDIF (USE_PROFILER)
install ( TARGETS gazebo_rendering DESTINATION ${CMAKE_INSTALL_PREFIX}/lib )
APPEND_TO_SERVER_HEADERS(${headers})
Modified: code/gazebo/branches/wg/server/wx/CMakeLists.txt
===================================================================
--- code/gazebo/branches/wg/server/wx/CMakeLists.txt 2010-12-02 05:58:12 UTC
(rev 8995)
+++ code/gazebo/branches/wg/server/wx/CMakeLists.txt 2010-12-02 07:21:25 UTC
(rev 8996)
@@ -59,7 +59,11 @@
add_library(gazebo_wx SHARED ${sources})
-target_link_libraries(gazebo_wx ${wxWidgets_LIBRARIES} Xpm profiler)
+IF (USE_PROFILER)
+ target_link_libraries(gazebo_wx ${wxWidgets_LIBRARIES} Xpm profiler)
+ELSE (USE_PROFILER)
+ target_link_libraries(gazebo_wx ${wxWidgets_LIBRARIES} Xpm)
+ENDIF (USE_PROFILER)
if (CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE})
set_source_files_properties(${sources} PROPERTIES LINK_FLAGS
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
