Revision: 8272
http://playerstage.svn.sourceforge.net/playerstage/?rev=8272&view=rev
Author: natepak
Date: 2009-09-30 18:13:39 +0000 (Wed, 30 Sep 2009)
Log Message:
-----------
Added better error messages to the configuration process
Modified Paths:
--------------
code/gazebo/trunk/CMakeLists.txt
code/gazebo/trunk/cmake/FindOde.cmake
code/gazebo/trunk/cmake/GazeboUtils.cmake
code/gazebo/trunk/cmake/SearchForStuff.cmake
Modified: code/gazebo/trunk/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/CMakeLists.txt 2009-09-30 17:42:49 UTC (rev 8271)
+++ code/gazebo/trunk/CMakeLists.txt 2009-09-30 18:13:39 UTC (rev 8272)
@@ -66,54 +66,68 @@
ENDIF (NOT CMAKE_BUILD_TYPE)
STRING(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE)
-MESSAGE (STATUS "====== Finding 3rd Party Packages ======")
+SET (build_errors "" CACHE INTERNAL "build errors" FORCE)
+
+MESSAGE (STATUS "\n\n====== Finding 3rd Party Packages ======")
INCLUDE (${gazebo_cmake_dir}/SearchForStuff.cmake)
-MESSAGE (STATUS "----------------------------------------")
+MESSAGE (STATUS "----------------------------------------\n")
-########################################
-# Write the config.h file
-CONFIGURE_FILE (${PROJECT_SOURCE_DIR}/config.h.in
${PROJECT_BINARY_DIR}/config.h)
-
-########################################
-# Make the gazebo rc file
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/gazeborc.cmake
${PROJECT_BINARY_DIR}/.gazeborc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/.gazeborc DESTINATION $ENV{HOME}/)
-
-INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
-
-message (STATUS "Cmake C Flags:${CMAKE_C_FLAGS}")
-
-IF (BUILD_GAZEBO)
- ADD_SUBDIRECTORY(libgazebo)
- ADD_SUBDIRECTORY(server)
- ADD_SUBDIRECTORY(worlds)
- ADD_SUBDIRECTORY(Media)
+if ( build_errors )
+ message(STATUS "!!! BUILD ERRORS !!!")
+ message(STATUS "These errors must be resolved before compiling")
+ foreach (msg ${build_errors})
+ message(STATUS ${msg})
+ endforeach (msg ${build_errors})
+ message(STATUS "!!! END BUILD ERRORS !!!\n")
+else (build_errors)
+ ########################################
+ # Write the config.h file
+ CONFIGURE_FILE (${PROJECT_SOURCE_DIR}/config.h.in
${PROJECT_BINARY_DIR}/config.h)
- IF (INCLUDE_PLAYER)
- ADD_SUBDIRECTORY(player)
- ENDIF (INCLUDE_PLAYER)
+ ########################################
+ # Make the gazebo rc file
+ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/gazeborc.cmake
${PROJECT_BINARY_DIR}/.gazeborc @ONLY)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/.gazeborc DESTINATION $ENV{HOME}/)
- IF (INCLUDE_WEBGAZEBO)
- Add_SUBDIRECTORY(webgazebo)
- ENDIF (INCLUDE_WEBGAZEBO)
+ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
- MESSAGE (STATUS "Build Type: ${CMAKE_BUILD_TYPE}")
- MESSAGE (STATUS "Install path: ${CMAKE_INSTALL_PREFIX}")
-ENDIF (BUILD_GAZEBO)
+ message (STATUS "Cmake C Flags:${CMAKE_C_FLAGS}")
+
+ 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)
+
+ # Cpack stuff
+ INCLUDE (InstallRequiredSystemLibraries)
+ SET (CPACK_PACKAGE_NAME "${PROJECT_NAME}")
+ SET (CPACK_PACKAGE_VERSION_MAJOR "${GAZEBO_MAJOR_VERSION}")
+ SET (CPACK_PACKAGE_VERSION_MINOR "${GAZEBO_MINOR_VERSION}")
+ SET (CPACK_PACKAGE_VERSION_PATCH "${GAZEBO_REVISION_VERSION}")
+ SET (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Gazebo robot simulator")
+ SET (CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME_LOWER}-${GAZEBO_VERSION}")
+ SET (CPACK_SOURCE_PACKAGE_FILE_NAME
"${PROJECT_NAME_LOWER}-${GAZEBO_VERSION}")
+ SET (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING")
+ SET (CPACK_GENERATOR "TBZ2")
+ SET (CPACK_SOURCE_GENERATOR "TBZ2")
+ LIST (APPEND CPACK_SOURCE_IGNORE_FILES "/.svn/;.swp$;/build/")
+ INCLUDE (CPack)
-# Cpack stuff
-INCLUDE (InstallRequiredSystemLibraries)
-SET (CPACK_PACKAGE_NAME "${PROJECT_NAME}")
-SET (CPACK_PACKAGE_VERSION_MAJOR "${GAZEBO_MAJOR_VERSION}")
-SET (CPACK_PACKAGE_VERSION_MINOR "${GAZEBO_MINOR_VERSION}")
-SET (CPACK_PACKAGE_VERSION_PATCH "${GAZEBO_REVISION_VERSION}")
-SET (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Gazebo robot simulator")
-SET (CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME_LOWER}-${GAZEBO_VERSION}")
-SET (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME_LOWER}-${GAZEBO_VERSION}")
-SET (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING")
-SET (CPACK_GENERATOR "TBZ2")
-SET (CPACK_SOURCE_GENERATOR "TBZ2")
-LIST (APPEND CPACK_SOURCE_IGNORE_FILES "/.svn/;.swp$;/build/")
-INCLUDE (CPack)
+ message(STATUS "Configuration successful. Type make to compile gazebo")
+endif(build_errors)
+
GAZEBOSERVER_RESET_LISTS()
Modified: code/gazebo/trunk/cmake/FindOde.cmake
===================================================================
--- code/gazebo/trunk/cmake/FindOde.cmake 2009-09-30 17:42:49 UTC (rev
8271)
+++ code/gazebo/trunk/cmake/FindOde.cmake 2009-09-30 18:13:39 UTC (rev
8272)
@@ -34,7 +34,7 @@
ENDIF (NOT ODE_FOUND)
IF (NOT ODE_FOUND)
- MESSAGE (SEND_ERROR "\nError: ODE and development files not found. See the
following website: http://www.ode.org";)
+ BUILD_ERROR ("ODE and development files not found. See the following
website: http://www.ode.org";)
ELSE (NOT ODE_FOUND)
#SET (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${ODE_CFLAGS_OTHER}"
CACHE INTERNAL "added dSINGLE" FORCE)
#SET (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${ODE_CFLAGS_OTHER}"
CACHE INTERNAL "added dSINGLE" FORCE)
Modified: code/gazebo/trunk/cmake/GazeboUtils.cmake
===================================================================
--- code/gazebo/trunk/cmake/GazeboUtils.cmake 2009-09-30 17:42:49 UTC (rev
8271)
+++ code/gazebo/trunk/cmake/GazeboUtils.cmake 2009-09-30 18:13:39 UTC (rev
8272)
@@ -71,6 +71,14 @@
#STRING(STRIP ${${_string}} ${_string})
ENDMACRO (LIST_TO_STRING)
+macro (BUILD_ERROR)
+ foreach (str ${ARGN})
+ SET (msg "ERROR: ${str}" )
+ MESSAGE (STATUS ${msg} )
+ APPEND_TO_CACHED_LIST(build_errors "build errors" ${msg})
+ endforeach (str ${ARGN})
+endmacro (BUILD_ERROR)
+
###############################################################################
# Reset lists
MACRO (GAZEBOSERVER_RESET_LISTS)
Modified: code/gazebo/trunk/cmake/SearchForStuff.cmake
===================================================================
--- code/gazebo/trunk/cmake/SearchForStuff.cmake 2009-09-30 17:42:49 UTC
(rev 8271)
+++ code/gazebo/trunk/cmake/SearchForStuff.cmake 2009-09-30 18:13:39 UTC
(rev 8272)
@@ -20,7 +20,7 @@
pkg_check_modules(OGRE OGRE>=${OGRE_VERSION})
IF (NOT OGRE_FOUND)
- MESSAGE (SEND_ERROR "\nError: Ogre3d version >=${OGRE_VERSION} and
development files not found. See the following website: http://www.orge3d.org";)
+ BUILD_ERROR("Ogre3d version >=${OGRE_VERSION} and development files not
found. See the following website for installation instructions:
http://www.orge3d.org";)
ELSE (NOT OGRE_FOUND)
SET (OGRE_LIBRARY_PATH ${OGRE_LIBRARY_DIRS} CACHE INTERNAL "Ogre library
path")
@@ -43,7 +43,7 @@
pkg_check_modules(XML libxml-2.0)
IF (NOT XML_FOUND)
- MESSAGE (SEND_ERROR "\nError: libxml2 and development files not found. See
the following website: http://www.xmlsoft.org";)
+ BUILD_ERROR("libxml2 and development files not found. See the following
website: http://www.xmlsoft.org";)
ELSE (NOT XML_FOUND)
APPEND_TO_CACHED_LIST(gazeboserver_include_dirs
${gazeboserver_include_dirs_desc}
@@ -61,7 +61,7 @@
pkg_check_modules(XFT xft)
IF (NOT XFT_FOUND)
- MESSAGE (SEND_ERROR "\nError: XFT and development files not found. See the
following website: http://www.fontconfig.org";)
+ BUILD_ERROR("XFT and development files not found. See the following
website: http://www.fontconfig.org";)
ELSE (NOT XFT_FOUND)
APPEND_TO_CACHED_LIST(gazeboserver_include_dirs
${gazeboserver_include_dirs_desc}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
