From: <na...@us...> - 2009-05-08 18:35:01
|
Revision: 7628 http://playerstage.svn.sourceforge.net/playerstage/?rev=7628&view=rev Author: natepak Date: 2009-05-08 18:34:57 +0000 (Fri, 08 May 2009) Log Message: ----------- Fixed release build option Modified Paths: -------------- code/gazebo/trunk/server/CMakeLists.txt Modified: code/gazebo/trunk/server/CMakeLists.txt =================================================================== --- code/gazebo/trunk/server/CMakeLists.txt 2009-05-08 16:55:50 UTC (rev 7627) +++ code/gazebo/trunk/server/CMakeLists.txt 2009-05-08 18:34:57 UTC (rev 7628) @@ -93,7 +93,9 @@ SET_SOURCE_FILES_PROPERTIES(${gazeboserver_sources} PROPERTIES COMPILE_FLAGS "${GAZEBO_CFLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}") -SET_SOURCE_FILES_PROPERTIES(${gazeboserver_sources} PROPERTIES LINK_FLAGS ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}}) +IF (${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}}) + SET_SOURCE_FILES_PROPERTIES(${gazeboserver_sources} PROPERTIES LINK_FLAGS ${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}}) +ENDIF (${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}}) TARGET_LINK_LIBRARIES( gazebo gazeboshm ${gazeboserver_link_libs} ${FLTK_LIBRARIES} ${Boost_LIBRARIES}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <hsu...@us...> - 2009-05-15 15:57:02
|
Revision: 7670 http://playerstage.svn.sourceforge.net/playerstage/?rev=7670&view=rev Author: hsujohnhsu Date: 2009-05-15 15:56:54 +0000 (Fri, 15 May 2009) Log Message: ----------- fix install location of .gazeborc. Modified Paths: -------------- code/gazebo/trunk/server/CMakeLists.txt Modified: code/gazebo/trunk/server/CMakeLists.txt =================================================================== --- code/gazebo/trunk/server/CMakeLists.txt 2009-05-14 21:11:53 UTC (rev 7669) +++ code/gazebo/trunk/server/CMakeLists.txt 2009-05-15 15:56:54 UTC (rev 7670) @@ -126,5 +126,5 @@ ######################################## # Make the gazebo rc file CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/gazeborc.cmake ${CMAKE_CURRENT_BINARY_DIR}/.gazeborc @ONLY) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/.gazeborc DESTINATION ~/) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/.gazeborc DESTINATION $ENV{HOME}/) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <na...@us...> - 2009-05-15 20:25:12
|
Revision: 7678 http://playerstage.svn.sourceforge.net/playerstage/?rev=7678&view=rev Author: natepak Date: 2009-05-15 20:25:07 +0000 (Fri, 15 May 2009) Log Message: ----------- Removed compile flags for OpenALAPI Modified Paths: -------------- code/gazebo/trunk/server/CMakeLists.txt Modified: code/gazebo/trunk/server/CMakeLists.txt =================================================================== --- code/gazebo/trunk/server/CMakeLists.txt 2009-05-15 19:56:44 UTC (rev 7677) +++ code/gazebo/trunk/server/CMakeLists.txt 2009-05-15 20:25:07 UTC (rev 7678) @@ -62,7 +62,6 @@ Param.cc GraphicsIfaceHandler.cc GuiAPI.cc - OpenALAPI.cc Simulator.cc ) @@ -87,7 +86,6 @@ Param.hh GraphicsIfaceHandler.hh GuiAPI.hh - OpenALAPI.hh Simulator.hh ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <na...@us...> - 2009-06-03 18:18:04
|
Revision: 7775 http://playerstage.svn.sourceforge.net/playerstage/?rev=7775&view=rev Author: natepak Date: 2009-06-03 18:18:02 +0000 (Wed, 03 Jun 2009) Log Message: ----------- Removed rpath from gazebo executable build. Fix for ubuntu intrepid Modified Paths: -------------- code/gazebo/trunk/server/CMakeLists.txt Modified: code/gazebo/trunk/server/CMakeLists.txt =================================================================== --- code/gazebo/trunk/server/CMakeLists.txt 2009-06-03 14:11:22 UTC (rev 7774) +++ code/gazebo/trunk/server/CMakeLists.txt 2009-06-03 18:18:02 UTC (rev 7775) @@ -99,6 +99,10 @@ ADD_EXECUTABLE(gazebo-exec main.cc) SET_TARGET_PROPERTIES(gazebo-exec PROPERTIES OUTPUT_NAME "gazebo") +# Removes colon separated rpath. This breaks Ubuntu-intrepid +# (possibly gcc-4.3.2). +SET_TARGET_PROPERTIES(gazebo-exec PROPERTIES SKIP_BUILD_RPATH TRUE) + LIST_TO_STRING(GAZEBO_CFLAGS "${gazeboserver_cflags}") SET_SOURCE_FILES_PROPERTIES(${gazeboserver_sources} PROPERTIES COMPILE_FLAGS "${GAZEBO_CFLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |