Revision: 7630
http://playerstage.svn.sourceforge.net/playerstage/?rev=7630&view=rev
Author: natepak
Date: 2009-05-08 21:41:48 +0000 (Fri, 08 May 2009)
Log Message:
-----------
Fixed manual boost flags
Modified Paths:
--------------
code/gazebo/trunk/CMakeLists.txt
code/gazebo/trunk/cmake/GazeboUtils.cmake
code/gazebo/trunk/cmake/SearchForStuff.cmake
code/gazebo/trunk/server/CMakeLists.txt
Modified: code/gazebo/trunk/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/CMakeLists.txt 2009-05-08 21:09:56 UTC (rev 7629)
+++ code/gazebo/trunk/CMakeLists.txt 2009-05-08 21:41:48 UTC (rev 7630)
@@ -28,8 +28,9 @@
"Location of CMake scripts")
SET (boost_include_dirs "" CACHE STRING "Boost include paths. Use this to
override automatic detection.")
-SET (boost_library_dirs "" CACHE STRING "Boost library paths. Use this to
override automatic detection.")
-SET (boost_libraries "" CACHE STRING "Boost libraries. Use this to override
automatic detection.")
+SET (boost_link_flags "" CACHE STRING "Boost link flags. Use this to override
automatic detection.")
+#SET (boost_library_dirs "" CACHE STRING "Boost library paths. Use this to
override automatic detection.")
+#SET (boost_libraries "" CACHE STRING "Boost libraries. Use this to override
automatic detection.")
#####################################
Modified: code/gazebo/trunk/cmake/GazeboUtils.cmake
===================================================================
--- code/gazebo/trunk/cmake/GazeboUtils.cmake 2009-05-08 21:09:56 UTC (rev
7629)
+++ code/gazebo/trunk/cmake/GazeboUtils.cmake 2009-05-08 21:41:48 UTC (rev
7630)
@@ -1,5 +1,14 @@
################################################################################
+#APPEND_TO_CACHED_STRING(_string _cacheDesc [items...])
+# Appends items to a cached list.
+MACRO (APPEND_TO_CACHED_STRING _string _cacheDesc)
+ FOREACH (newItem ${ARGN})
+ SET (${_string} "${${_string}} ${newItem}" CACHE INTERNAL ${_cacheDesc}
FORCE)
+ ENDFOREACH (newItem ${ARGN})
+ENDMACRO (APPEND_TO_CACHED_STRING)
+
+################################################################################
# APPEND_TO_CACHED_LIST (_list _cacheDesc [items...]
# Appends items to a cached list.
MACRO (APPEND_TO_CACHED_LIST _list _cacheDesc)
Modified: code/gazebo/trunk/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/trunk/cmake/SearchForStuff.cmake 2009-05-08 21:09:56 UTC
(rev 7629)
+++ code/gazebo/trunk/cmake/SearchForStuff.cmake 2009-05-08 21:41:48 UTC
(rev 7630)
@@ -179,7 +179,6 @@
########################################
# Find Boost, if not specified manually
IF (NOT boost_include_dirs AND NOT boost_library_dirs AND NOT boost_libraries )
- MESSAGE(STATUS "HERE")
INCLUDE (FindBoost)
FIND_PACKAGE( Boost 1.34.1 COMPONENTS thread signals)
IF (NOT Boost_FOUND)
@@ -187,23 +186,24 @@
SET (BUILD_GAZEBO OFF CACHE BOOL "Build Gazebo" FORCE)
ENDIF (NOT Boost_FOUND)
-
LIST_TO_STRING(tmp "${Boost_INCLUDE_DIRS}")
SET (boost_include_dirs ${Boost_INCLUDE_DIRS} CACHE STRING
"Boost include paths. Use this to override automatic detection." FORCE)
- LIST_TO_STRING(tmp "${Boost_LIBRARY_DIRS}")
- SET (boost_library_dirs ${Boost_LIBRARY_DIRS} CACHE STRING
- "Boost library paths. Use this to override automatic detection." FORCE)
+ FOREACH (dir ${Boost_LIBRARY_DIRS})
+ APPEND_TO_CACHED_STRING(boost_link_flags
+ "Boost link flags. Use this to override automatic detection." "-L${dir}"
)
+ ENDFOREACH (dir Boost_LIBRARY_DIRS)
- LIST_TO_STRING(tmp "${Boost_LIBRARIES}")
- SET (boost_libraries ${Boost_LIBRARIES} CACHE STRING
- "Boost libraries. Use this to override automatic detection." FORCE)
+ FOREACH (lib ${Boost_LIBRARIES})
+ APPEND_TO_CACHED_STRING (boost_link_flags
+ "Boost link flags. Use this to override automatic detection." "-l${lib}"
)
+ ENDFOREACH (lib Boost_LIBRARIES)
+
ENDIF (NOT boost_include_dirs AND NOT boost_library_dirs AND NOT
boost_libraries )
MESSAGE (STATUS "Boost IDIRS ${boost_include_dirs}")
-MESSAGE (STATUS "Boost LDIRS ${boost_library_dirs}")
-MESSAGE (STATUS "Boost LIBS ${boost_libraries}")
+MESSAGE (STATUS "Boost LFLAGS ${boost_link_flags}")
########################################
# Find avformat and avcodec
Modified: code/gazebo/trunk/server/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/CMakeLists.txt 2009-05-08 21:09:56 UTC (rev
7629)
+++ code/gazebo/trunk/server/CMakeLists.txt 2009-05-08 21:41:48 UTC (rev
7630)
@@ -92,10 +92,14 @@
SET_SOURCE_FILES_PROPERTIES(${gazeboserver_sources} PROPERTIES COMPILE_FLAGS
"${GAZEBO_CFLAGS} ${CMAKE_C_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}})
+# Construct the aggregate link flags
+APPEND_TO_CACHED_STRING(GAZEBO_LFLAGS "gazebo link flags"
${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE}})
+APPEND_TO_CACHED_STRING(GAZEBO_LFLAGS "gazebo link flags" ${boost_link_flags})
+MESSAGE (STATUS "GAZEBO LINK FLAGS|${GAZEBO_LFLAGS}|")
+SET_SOURCE_FILES_PROPERTIES(${gazeboserver_sources} PROPERTIES LINK_FLAGS
+ ${GAZEBO_LFLAGS})
+
TARGET_LINK_LIBRARIES( gazebo gazeboshm ${gazeboserver_link_libs}
${FLTK_LIBRARIES} ${boost_libraries})
INSTALL (TARGETS gazebo DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image
processing features enabled. http://p.sf.net/sfu/kodak-com
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
