Revision: 7635
http://playerstage.svn.sourceforge.net/playerstage/?rev=7635&view=rev
Author: natepak
Date: 2009-05-11 04:52:57 +0000 (Mon, 11 May 2009)
Log Message:
-----------
Output better config error messsages
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-11 01:43:31 UTC (rev 7634)
+++ code/gazebo/trunk/CMakeLists.txt 2009-05-11 04:52:57 UTC (rev 7635)
@@ -10,6 +10,9 @@
SET (GAZEBO_VERSION 0.9.0)
MESSAGE (STATUS "${PROJECT_NAME} version ${GAZEBO_VERSION}")
+
+SET (BUILD_GAZEBO OFF CACHE INTERNAL "Build Gazebo" FORCE)
+
SET (gazeboserver_sources_desc "List of server sources"
CACHE INTERNAL "Gazebo server sources list description" FORCE)
SET (gazeboserver_include_dirs_desc "List of server include directories"
@@ -33,9 +36,9 @@
#####################################
# Build type cflags
-SET (CMAKE_C_FLAGS_RELEASE " -O3 -DNDEBUG -fPIC -Wall " CACHE INTERNAL "C
Flags for release" FORCE)
-SET (CMAKE_C_FLAGS_DEBUG " -ggdb -fPIC " CACHE INTERNAL "C Flags fro debug"
FORCE)
-SET (CMAKE_C_FLAGS_PROFILE " -ggdb -pg -fPIC " CACHE INTERNAL "C Flags for
profile" FORCE)
+SET (CMAKE_C_FLAGS_RELEASE " -O3 -DNDEBUG -Wall " CACHE INTERNAL "C Flags for
release" FORCE)
+SET (CMAKE_C_FLAGS_DEBUG " -ggdb " CACHE INTERNAL "C Flags fro debug" FORCE)
+SET (CMAKE_C_FLAGS_PROFILE " -ggdb -pg " CACHE INTERNAL "C Flags for profile"
FORCE)
#####################################
# Build type link flags
@@ -55,18 +58,22 @@
INCLUDE (${gazebo_cmake_dir}/SearchForStuff.cmake)
MESSAGE (STATUS "----------------------------------------")
-ADD_SUBDIRECTORY(libgazebo)
-ADD_SUBDIRECTORY(server)
-ADD_SUBDIRECTORY(worlds)
-ADD_SUBDIRECTORY(Media)
+IF (BUILD_GAZEBO)
+ ADD_SUBDIRECTORY(libgazebo)
+ ADD_SUBDIRECTORY(server)
+ ADD_SUBDIRECTORY(worlds)
+ ADD_SUBDIRECTORY(Media)
+
+ IF (INCLUDE_PLAYER)
+ ADD_SUBDIRECTORY(player)
+ ENDIF (INCLUDE_PLAYER)
+
+ IF (INCLUDE_WEBGAZEBO)
+ Add_SUBDIRECTORY(webgazebo)
+ ENDIF (INCLUDE_WEBGAZEBO)
+
+ MESSAGE (STATUS "Build Type: ${CMAKE_BUILD_TYPE}")
+ MESSAGE (STATUS "Install path: ${CMAKE_INSTALL_PREFIX}")
+ENDIF (BUILD_GAZEBO)
-IF (INCLUDE_PLAYER)
- ADD_SUBDIRECTORY(player)
-ENDIF (INCLUDE_PLAYER)
-
-IF (INCLUDE_WEBGAZEBO)
- Add_SUBDIRECTORY(webgazebo)
-ENDIF (INCLUDE_WEBGAZEBO)
-
-MESSAGE (STATUS "Build Type: ${CMAKE_BUILD_TYPE}")
-MESSAGE (STATUS "Install path: ${CMAKE_INSTALL_PREFIX}")
+GAZEBOSERVER_RESET_LISTS()
Modified: code/gazebo/trunk/cmake/GazeboUtils.cmake
===================================================================
--- code/gazebo/trunk/cmake/GazeboUtils.cmake 2009-05-11 01:43:31 UTC (rev
7634)
+++ code/gazebo/trunk/cmake/GazeboUtils.cmake 2009-05-11 04:52:57 UTC (rev
7635)
@@ -53,4 +53,5 @@
${gazeboserver_link_libs_desc} FORCE)
SET (gazeboserver_cflags "" CACHE INTERNAL
${gazeboserver_cflags_desc} FORCE)
+
ENDMACRO (GAZEBOSERVER_RESET_LISTS)
Modified: code/gazebo/trunk/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/trunk/cmake/SearchForStuff.cmake 2009-05-11 01:43:31 UTC
(rev 7634)
+++ code/gazebo/trunk/cmake/SearchForStuff.cmake 2009-05-11 04:52:57 UTC
(rev 7635)
@@ -171,20 +171,32 @@
ENDIF (NOT WEBSIM_FOUND)
ELSE (PKG_CONFIG_FOUND)
+ SET (BUILD_GAZEBO OFF CACHE INTERNAL "Build Gazebo" FORCE)
MESSAGE (FATAL_ERROR "\nError: pkg-config not found")
- SET (BUILD_GAZEBO OFF CACHE BOOL "Build Gazebo" FORCE)
ENDIF (PKG_CONFIG_FOUND)
########################################
# Find Boost, if not specified manually
IF (NOT boost_include_dirs AND NOT boost_library_dirs AND NOT boost_libraries )
+ SET(Boost_ADDITIONAL_VERSIONS "1.37.0")
+
+ # Clear some variables to ensure that the checks for boost are
+ # always run
+ SET (Boost_THREAD_FOUND OFF CACHE INTERNAL "" FORCE)
+ SET (Boost_SIGNALS_FOUND OFF CACHE INTERNAL "" FORCE)
+ SET (Boost_INCLUDE_DIR "" CACHE INTERNAL "" FORCE)
+
INCLUDE (FindBoost)
- SET(Boost_ADDITIONAL_VERSIONS "1.37.0")
+
FIND_PACKAGE( Boost 1.37.0 COMPONENTS thread signals)
+
IF (NOT Boost_FOUND)
- MESSAGE (FATAL_ERROR "Boost thread and signals not found")
- SET (BUILD_GAZEBO OFF CACHE BOOL "Build Gazebo" FORCE)
+ SET (BUILD_GAZEBO OFF CACHE INTERNAL "Build Gazebo" FORCE)
+ MESSAGE (FATAL_ERROR "Boost thread and signals not found. Please install
Boost threads and signals version 1.37.0 or higher.")
+
+ ELSE (NOT Boost_FOUND)
+ MESSAGE (STATUS "Found Boost!")
ENDIF (NOT Boost_FOUND)
SET (boost_include_dirs ${Boost_INCLUDE_DIRS} CACHE STRING
Modified: code/gazebo/trunk/server/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/CMakeLists.txt 2009-05-11 01:43:31 UTC (rev
7634)
+++ code/gazebo/trunk/server/CMakeLists.txt 2009-05-11 04:52:57 UTC (rev
7635)
@@ -104,4 +104,3 @@
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/gazeborc.cmake
${CMAKE_CURRENT_BINARY_DIR}/.gazeborc @ONLY)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/.gazeborc DESTINATION ~/)
-GAZEBOSERVER_RESET_LISTS()
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
