Revision: 8403
http://playerstage.svn.sourceforge.net/playerstage/?rev=8403&view=rev
Author: natepak
Date: 2009-11-14 17:07:51 +0000 (Sat, 14 Nov 2009)
Log Message:
-----------
Fixed up cmake build
Modified Paths:
--------------
code/gazebo/trunk/cmake/SearchForStuff.cmake
code/gazebo/trunk/server/CMakeLists.txt
code/gazebo/trunk/server/gui/CMakeLists.txt
Modified: code/gazebo/trunk/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/trunk/cmake/SearchForStuff.cmake 2009-11-13 22:38:34 UTC
(rev 8402)
+++ code/gazebo/trunk/cmake/SearchForStuff.cmake 2009-11-14 17:07:51 UTC
(rev 8403)
@@ -7,6 +7,11 @@
INCLUDE (${gazebo_cmake_dir}/FindOde.cmake)
INCLUDE (${gazebo_cmake_dir}/FindFreeimage.cmake)
+if (NOT FLTK_FOUND)
+ BUILD_ERROR("FLTK libraries and development files not found. See the
following website for installation instructions: http://fltk.org";)
+endif (NOT FLTK_FOUND)
+
+
SET (INCLUDE_WEBGAZEBO ON CACHE BOOL "Build webgazebo" FORCE)
SET (OGRE_LIBRARY_PATH "/usr/local/lib" CACHE INTERNAL "Ogre library path")
Modified: code/gazebo/trunk/server/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/CMakeLists.txt 2009-11-13 22:38:34 UTC (rev
8402)
+++ code/gazebo/trunk/server/CMakeLists.txt 2009-11-14 17:07:51 UTC (rev
8403)
@@ -141,9 +141,10 @@
${freeimage_library}
gazebo_rendering
gazebo_av-shared
- gazebo_gui-shared
+ gazebo_gui
gazebo_physics
gazebo
+ assimp
)
if (INCLUDE_BULLET)
Modified: code/gazebo/trunk/server/gui/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/gui/CMakeLists.txt 2009-11-13 22:38:34 UTC (rev
8402)
+++ code/gazebo/trunk/server/gui/CMakeLists.txt 2009-11-14 17:07:51 UTC (rev
8403)
@@ -1,6 +1,8 @@
-INCLUDE (${gazebo_cmake_dir}/GazeboUtils.cmake)
+include (${gazebo_cmake_dir}/GazeboUtils.cmake)
-SET (sources Gui.cc
+include_directories( ${FLTK_INCLUDE_DIR} )
+
+set (sources Gui.cc
GLWindow.cc
MainMenu.cc
Toolbar.cc
@@ -9,7 +11,7 @@
GLFrame.cc
)
-SET (headers Gui.hh
+set (headers Gui.hh
GLWindow.hh
MainMenu.hh
Toolbar.hh
@@ -19,15 +21,12 @@
)
LIST_TO_STRING(GAZEBO_CFLAGS "${gazeboserver_cflags}")
-SET_SOURCE_FILES_PROPERTIES(${sources} PROPERTIES COMPILE_FLAGS
"${GAZEBO_CFLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}")
+set_source_files_properties(${sources} PROPERTIES COMPILE_FLAGS
"${GAZEBO_CFLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}")
-#ADD_LIBRARY(gazebo_gui STATIC ${sources})
-ADD_LIBRARY(gazebo_gui-shared SHARED ${sources})
+add_library(gazebo_gui SHARED ${sources})
-#TARGET_LINK_LIBRARIES(gazebo_gui ${FLTK_LIBRARIES} )
-TARGET_LINK_LIBRARIES(gazebo_gui-shared ${FLTK_LIBRARIES} )
+target_link_libraries(gazebo_gui ${FLTK_LIBRARIES} )
-#SET_TARGET_PROPERTIES(gazebo_gui PROPERTIES OUTPUT_NAME "gazebo_gui")
-SET_TARGET_PROPERTIES(gazebo_gui-shared PROPERTIES OUTPUT_NAME "gazebo_gui"
VERSION ${GAZEBO_VERSION})
+set_target_properties(gazebo_gui PROPERTIES OUTPUT_NAME "gazebo_gui" VERSION
${GAZEBO_VERSION})
-INSTALL (TARGETS 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.
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
