Revision: 7786
http://playerstage.svn.sourceforge.net/playerstage/?rev=7786&view=rev
Author: hsujohnhsu
Date: 2009-06-05 04:30:44 +0000 (Fri, 05 Jun 2009)
Log Message:
-----------
libgazebo_gui only install shared lib.
Modified Paths:
--------------
code/gazebo/branches/bullet/server/CMakeLists.txt
code/gazebo/branches/bullet/server/gui/CMakeLists.txt
Modified: code/gazebo/branches/bullet/server/CMakeLists.txt
===================================================================
--- code/gazebo/branches/bullet/server/CMakeLists.txt 2009-06-05 04:30:10 UTC
(rev 7785)
+++ code/gazebo/branches/bullet/server/CMakeLists.txt 2009-06-05 04:30:44 UTC
(rev 7786)
@@ -25,6 +25,7 @@
${gazeboserver_include_dirs}
${boost_include_dirs}
${freeimage_include_dir}
+ ${bullet_include_dir}
)
LINK_DIRECTORIES(
@@ -99,6 +100,11 @@
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}}")
Modified: code/gazebo/branches/bullet/server/gui/CMakeLists.txt
===================================================================
--- code/gazebo/branches/bullet/server/gui/CMakeLists.txt 2009-06-05
04:30:10 UTC (rev 7785)
+++ code/gazebo/branches/bullet/server/gui/CMakeLists.txt 2009-06-05
04:30:44 UTC (rev 7786)
@@ -19,10 +19,10 @@
ADD_LIBRARY(gazebo_gui STATIC ${sources})
ADD_LIBRARY(gazebo_gui-shared SHARED ${sources})
+#TARGET_LINK_LIBRARIES(gazebo_gui ${FLTK_LIBRARIES} )
TARGET_LINK_LIBRARIES(gazebo_gui ${FLTK_LIBRARIES} )
-TARGET_LINK_LIBRARIES(gazebo_gui-shared ${FLTK_LIBRARIES} )
#SET_TARGET_PROPERTIES(gazebo_gui-static PROPERTIES OUTPUT_NAME "gazebo_gui")
-SET_TARGET_PROPERTIES(gazebo_gui-shared PROPERTIES OUTPUT_NAME "gazebo_gui")
+SET_TARGET_PROPERTIES(gazebo_gui PROPERTIES OUTPUT_NAME "gazebo_gui")
-INSTALL (TARGETS gazebo_gui gazebo_gui-shared DESTINATION
${CMAKE_INSTALL_PREFIX}/lib)
+INSTALL (TARGETS gazebo_gui DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
OpenSolaris 2009.06 is a cutting edge operating system for enterprises
looking to deploy the next generation of Solaris that includes the latest
innovations from Sun and the OpenSource community. Download a copy and
enjoy capabilities such as Networking, Storage and Virtualization.
Go to: http://p.sf.net/sfu/opensolaris-get
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
