Revision: 8935
http://playerstage.svn.sourceforge.net/playerstage/?rev=8935&view=rev
Author: natepak
Date: 2010-10-04 16:53:48 +0000 (Mon, 04 Oct 2010)
Log Message:
-----------
Cleaned up the build messages
Modified Paths:
--------------
code/gazebo/trunk/CMakeLists.txt
code/gazebo/trunk/cmake/GazeboUtils.cmake
code/gazebo/trunk/cmake/SearchForStuff.cmake
Modified: code/gazebo/trunk/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/CMakeLists.txt 2010-10-04 04:56:07 UTC (rev 8934)
+++ code/gazebo/trunk/CMakeLists.txt 2010-10-04 16:53:48 UTC (rev 8935)
@@ -77,20 +77,30 @@
ENDIF (NOT CMAKE_BUILD_TYPE)
STRING(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE)
-SET (build_errors "" CACHE INTERNAL "build errors" FORCE)
+set (build_errors "" CACHE INTERNAL "build errors" FORCE)
+set (build_warnings "" CACHE INTERNAL "build warnings" FORCE)
MESSAGE (STATUS "\n\n====== Finding 3rd Party Packages ======")
INCLUDE (${gazebo_cmake_dir}/SearchForStuff.cmake)
MESSAGE (STATUS "----------------------------------------\n")
+if ( build_warnings )
+ message(STATUS "BUILD WARNINGS")
+ foreach (msg ${build_warnings})
+ message(STATUS ${msg})
+ endforeach (msg ${build_warnings})
+ message(STATUS "END BUILD WARNINGS\n")
+endif (build_warnings)
+
if ( build_errors )
- message(STATUS "!!! BUILD ERRORS !!!")
- message(STATUS "These errors must be resolved before compiling")
+ message(STATUS "BUILD ERRORS: These must be resolved before compiling.")
foreach (msg ${build_errors})
message(STATUS ${msg})
endforeach (msg ${build_errors})
- message(STATUS "!!! END BUILD ERRORS !!!\n")
+ message(STATUS "END BUILD ERRORS\n")
else (build_errors)
+
+
########################################
# Write the config.h file
configure_file (${PROJECT_SOURCE_DIR}/gazebo_config.h.in
${PROJECT_BINARY_DIR}/gazebo_config.h)
Modified: code/gazebo/trunk/cmake/GazeboUtils.cmake
===================================================================
--- code/gazebo/trunk/cmake/GazeboUtils.cmake 2010-10-04 04:56:07 UTC (rev
8934)
+++ code/gazebo/trunk/cmake/GazeboUtils.cmake 2010-10-04 16:53:48 UTC (rev
8935)
@@ -76,12 +76,21 @@
macro (BUILD_ERROR)
foreach (str ${ARGN})
- SET (msg "ERROR: ${str}" )
+ SET (msg "\t${str}" )
MESSAGE (STATUS ${msg} )
APPEND_TO_CACHED_LIST(build_errors "build errors" ${msg})
endforeach (str ${ARGN})
endmacro (BUILD_ERROR)
+macro (BUILD_WARNING)
+ foreach (str ${ARGN})
+ SET (msg "\t${str}" )
+ MESSAGE (STATUS ${msg} )
+ APPEND_TO_CACHED_LIST(build_warnings "build warning" ${msg})
+ endforeach (str ${ARGN})
+endmacro (BUILD_WARNING)
+
+
###############################################################################
# Reset lists
MACRO (GAZEBOSERVER_RESET_LISTS)
Modified: code/gazebo/trunk/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/trunk/cmake/SearchForStuff.cmake 2010-10-04 04:56:07 UTC
(rev 8934)
+++ code/gazebo/trunk/cmake/SearchForStuff.cmake 2010-10-04 16:53:48 UTC
(rev 8935)
@@ -34,7 +34,7 @@
include (FindOpenGL)
if (NOT OPENGL_FOUND)
- BUILD_ERROR ("OpenGL and development files not found.")
+ BUILD_ERROR ("Missing: OpenGL")
else ()
APPEND_TO_CACHED_LIST(gazeboserver_include_dirs
${gazeboserver_include_dirs_desc}
@@ -53,7 +53,7 @@
# Find ODE
pkg_check_modules(ODE ode>=${ODE_VERSION})
IF (NOT ODE_FOUND)
- BUILD_ERROR ("ODE and development files not found. See the following
website: http://www.ode.org";)
+ BUILD_ERROR ("Missing: ODE(http://www.ode.org)")
SET (INCLUDE_ODE FALSE CACHE BOOL "Include support for ODE")
ELSE (NOT ODE_FOUND)
SET (INCLUDE_ODE TRUE CACHE BOOL "Include support for ODE")
@@ -94,7 +94,7 @@
pkg_check_modules(OGRE OGRE>=${MIN_OGRE_VERSION})
if (NOT OGRE_FOUND)
- BUILD_ERROR("Ogre3d version >=${MIN_OGRE_VERSION} and development files
not found. See the following website for installation instructions:
http://www.orge3d.org";)
+ BUILD_ERROR("Missing: Ogre3d version
>=${MIN_OGRE_VERSION}(http://www.orge3d.org)")
else (NOT OGRE_FOUND)
set(ogre_ldflags ${OGRE_LDFLAGS})
set(ogre_include_dirs ${OGRE_INCLUDE_DIRS})
@@ -131,7 +131,7 @@
# Find GTK
pkg_check_modules(GTK2 gtk+-2.0)
IF (NOT GTK2_FOUND)
- BUILD_ERROR("gtk+-2.0 and development files not found. See the following
website: http://www.gtk.org";)
+ BUILD_ERROR("Missing: gtk+-2.0")
ELSE (NOT GTK2_FOUND)
APPEND_TO_CACHED_LIST(gazeboserver_include_dirs
${gazeboserver_include_dirs_desc}
@@ -158,7 +158,7 @@
# Find XML
pkg_check_modules(XML libxml-2.0)
IF (NOT XML_FOUND)
- BUILD_ERROR("libxml2 and development files not found. See the following
website: http://www.xmlsoft.org";)
+ BUILD_ERROR("Missing: libxml2(http://www.xmlsoft.org)")
ELSE (NOT XML_FOUND)
APPEND_TO_CACHED_LIST(gazeboserver_include_dirs
${gazeboserver_include_dirs_desc}
@@ -186,7 +186,7 @@
# Find libXPM
pkg_check_modules(XPM xpm)
if (NOT XPM_FOUND)
- BUILD_ERROR("libXpm and development files not found. See the following
website: http://cgit.freedesktop.org/xorg/lib/libXpm";)
+ BUILD_ERROR("Missing: libXpm(http://cgit.freedesktop.org/xorg/lib/libXpm)")
else (NOT XPM_FOUND)
APPEND_TO_CACHED_LIST(gazeboserver_include_dirs
${gazeboserver_include_dirs_desc}
@@ -207,7 +207,7 @@
# Find OpenAL
pkg_check_modules(OAL openal)
if (NOT OAL_FOUND)
- message (STATUS "Warning: Openal and development files not found. Audio
capabilities will be disabled. See the following website:
http://connect.creativelabs.com/openal/default.aspx";)
+ BUILD_WARNING ("Openal not found. Audio capabilities will be disabled.")
else (NOT OAL_FOUND)
set (HAVE_OPENAL TRUE)
APPEND_TO_CACHED_LIST(gazeboserver_include_dirs
@@ -228,7 +228,7 @@
# Find AV format
pkg_check_modules(AVF libavformat)
if (NOT AVF_FOUND)
- message (STATUS "Warning: libavformat and development files not found.
Audio capabilities will be disabled.")
+ BUILD_WARNING ("libavformat not found. Audio capabilities will be
disabled.")
else (NOT AVF_FOUND)
APPEND_TO_CACHED_LIST(gazeboserver_include_dirs
${gazeboserver_include_dirs_desc}
@@ -248,7 +248,7 @@
# Find avcodec
pkg_check_modules(AVC libavcodec)
if (NOT AVC_FOUND)
- message (STATUS "Warning: libavcodec and development files not found.
Audio capabilities will be disabled.")
+ BUILD_WARNING ("libavcodec not found. Audio capabilities will be
disabled.")
else (NOT AVC_FOUND)
APPEND_TO_CACHED_LIST(gazeboserver_include_dirs
${gazeboserver_include_dirs_desc}
@@ -273,7 +273,7 @@
pkg_check_modules(PLAYER playercore>=3.0)
if (NOT PLAYER_FOUND)
set (INCLUDE_PLAYER OFF CACHE BOOL "Build gazebo plugin for player" FORCE)
- message (STATUS "Warning: Player not found. The gazebo plugin for player
will not be built. See the following website:
http://playerstage.sourceforge.net";)
+ BUILD_WARNING ("Player not found, gazebo plugin for player will not be
built.")
else (NOT PLAYER_FOUND)
set (INCLUDE_PLAYER ON CACHE BOOL "Build gazebo plugin for player" FORCE)
set (PLAYER_INCLUDE_DIRS ${PLAYER_INCLUDE_DIRS} CACHE INTERNAL
@@ -289,7 +289,7 @@
pkg_check_modules(WEBSIM websim)
if (NOT WEBSIM_FOUND)
set (INCLUDE_WEBGAZEBO OFF CACHE BOOL "Build webgazebo" FORCE)
- message (STATUS "Warning: Websim not found. Webgazebo will not be built")
+ BUILD_WARNING ("Websim not found. Webgazebo will not be built")
else (NOT WEBSIM_FOUND)
set (WEBSIM_INCLUDE_DIRS ${WEBSIM_INCLUDE_DIRS} CACHE INTERNAL
"Websim include directory")
@@ -309,7 +309,7 @@
# Find wxWidgets
find_package(wxWidgets)
if (NOT wxWidgets_FOUND)
- BUILD_ERROR ("wxWidgets not found. See the following website:
http://www.wxwidgets.org";)
+ BUILD_ERROR ("Missing: wxWidgets(http://www.wxwidgets.org)")
endif (NOT wxWidgets_FOUND)
@@ -370,7 +370,7 @@
FIND_PATH(LIBAVFORMAT_PATH avformat.h ${libavformat_search_path})
IF (NOT LIBAVFORMAT_PATH)
MESSAGE (STATUS "Looking for avformat.h - not found")
- MESSAGE (STATUS " Warning: audio/video will not be built")
+ BUILD_WARNING ("avformat.h not found. audio/video will not be built")
SET (LIBAVFORMAT_PATH /usr/include)
ELSE (NOT LIBAVFORMAT_PATH)
MESSAGE (STATUS "Looking for avformat.h - found")
@@ -379,7 +379,7 @@
FIND_PATH(LIBAVCODEC_PATH avcodec.h ${libavcodec_search_path})
IF (NOT LIBAVCODEC_PATH)
MESSAGE (STATUS "Looking for avcodec.h - not found")
- MESSAGE (STATUS " Warning: audio/video will not be built")
+ BUILD_WARNING ("avcodec.h not found. audio/video will not be built")
SET (LIBAVCODEC_PATH /usr/include)
ELSE (NOT LIBAVCODEC_PATH)
MESSAGE (STATUS "Looking for avcodec.h - found")
@@ -396,7 +396,7 @@
FIND_PATH(LIBEVENT_PATH event.h ${libevent_search_path})
IF (NOT LIBEVENT_PATH)
MESSAGE (STATUS "Looking for event.h - not found")
- MESSAGE (STATUS " Warning: webgazebo will not be built")
+ BUILD_WARNING ("event.h not found. webgazebo will not be built")
SET (INCLUDE_WEBGAZEBO OFF CACHE BOOL "Found libevent" FORCE)
ELSE (NOT LIBEVENT_PATH)
MESSAGE (STATUS "Looking for event.h - found")
@@ -423,7 +423,7 @@
FIND_PATH(libtool_include_dir ltdl.h /usr/include /usr/local/include)
IF (NOT libtool_include_dir)
MESSAGE (STATUS "Looking for ltdl.h - not found")
- MESSAGE (STATUS "Warning: Unable to find libtool, plugins will not be
supported.")
+ BUILD_WARNING ("ltdl.h not found, plugins will not be supported.")
SET (libtool_include_dir /usr/include)
ELSE (NOT libtool_include_dir)
MESSAGE (STATUS "Looking for ltdl.h - found")
@@ -460,7 +460,7 @@
endif ()
if (NOT libyaml OR NOT yaml_include)
- BUILD_ERROR("yaml libraries and development files not found. See the
following website for installation instructions: http://www.yaml.org";)
+ BUILD_ERROR("Missing: yaml(http://www.yaml.org)")
endif (NOT libyaml OR NOT yaml_include)
########################################
@@ -468,7 +468,7 @@
find_path(libdl_include_dir dlfcn.h /usr/include /usr/local/include)
if (NOT libdl_include_dir)
message (STATUS "Looking for dlfcn.h - not found")
- message (STATUS "Warning: Unable to find libdl, plugins will not be
supported.")
+ BUILD_WARNING ("dlfcn.h not found, plugins will not be supported.")
set (libdl_include_dir /usr/include)
else (NOT libdl_include_dir)
message (STATUS "Looking for dlfcn.h - found")
@@ -477,7 +477,7 @@
find_library(libdl_library dl /usr/lib /usr/local/lib)
if (NOT libdl_library)
message (STATUS "Looking for libdl - not found")
- message (STATUS "Warning: Unable to find libdl, plugins will not be
supported.")
+ BUILD_WARNING ("libdl not found, plugins will not be supported.")
else (NOT libdl_library)
message (STATUS "Looking for libdl - found")
endif (NOT libdl_library)
@@ -495,8 +495,7 @@
find_path(assimp_include_dir assimp/assimp.hpp ${assimp_include_dirs} ENV
CPATH)
if (NOT assimp_include_dir)
- #BUILD_ERROR("assimp not found. See the following website for installation
instructions: http://assimp.sourceforge.net";)
- message (STATUS "Looking for assimp/assimp.hpp - not found. Using built in
version.")
+ message (STATUS "Looking for assimp/assimp.hpp - not found.")
set (assimp_include_dirs /usr/include CACHE STRING
"Assimp include paths. Use this to override automatic detection.")
else (NOT assimp_include_dir)
@@ -515,7 +514,7 @@
endif (assimp_library)
if (NOT assimp_include_dir OR NOT assimp_library)
- BUILD_ERROR("assimp not found. See the following website for installation
instructions: http://assimp.sourceforge.net";)
+ BUILD_ERROR("Missing: Assimp(http://assimp.sourceforge.net)")
endif (NOT assimp_include_dir OR NOT assimp_library)
endif (NOT assimp_include_dirs AND NOT assimp_library_dirs AND NOT
assimp_libraries )
@@ -527,7 +526,6 @@
find_path(bullet_include_dir btBulletDynamicsCommon.h ${bullet_include_dirs}
ENV CPATH)
if (NOT bullet_include_dir)
- #BUILD_ERROR("bullet not found. See the following website for installation
instructions: http://bullet.sourceforge.net";)
message (STATUS "Looking for btBulletDynamicsCommon.h - not found.")
set (bullet_include_dirs /usr/include CACHE STRING
"bullet include paths. Use this to override automatic detection.")
@@ -602,7 +600,7 @@
set( CMAKE_REQUIRED_FLAGS)
if (NOT BULLET_DOUBLE_PRECISION)
- BUILD_ERROR("bullet was not compiled to use double precision.")
+ BUILD_ERROR("Dependency: bullet was not compiled to use double precision.")
set (INCLUDE_BULLET OFF CACHE BOOL "Include Bullet" FORCE)
endif (NOT BULLET_DOUBLE_PRECISION)
endif (INCLUDE_BULLET)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Virtualization is moving to the mainstream and overtaking non-virtualized
environment for deploying applications. Does it make network security
easier or more difficult to achieve? Read this whitepaper to separate the
two and get a better understanding.
http://p.sf.net/sfu/hp-phase2-d2d
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
