diff options
| author | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_fr> | 2010-05-27 18:37:04 +0200 |
|---|---|---|
| committer | Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_fr> | 2010-05-27 18:47:36 +0200 |
| commit | 5b08d350f10b7ba1be2b966af68017b64d4bbcd0 (patch) | |
| tree | e2eaf199d779a981ddbc867ce0c426c6e8f44e79 | |
| parent | 98820e79e786f3d318a45e0f8e6100841530ff50 (diff) | |
| download | mana-5b08d350f10b7ba1be2b966af68017b64d4bbcd0.tar.gz mana-5b08d350f10b7ba1be2b966af68017b64d4bbcd0.tar.bz2 mana-5b08d350f10b7ba1be2b966af68017b64d4bbcd0.tar.xz mana-5b08d350f10b7ba1be2b966af68017b64d4bbcd0.zip | |
Added pseudo-check for the Guichan minimal required version: 0.8.0.
The guichan/widgetlistener.hpp file presence is now checked for both
autotools and cmake.
This resolves TMW-Mantis: #503
Reviewed-by: Jaxad0127
| -rw-r--r-- | CMake/Modules/FindGuichan.cmake | 7 | ||||
| -rwxr-xr-x | configure.ac | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/CMake/Modules/FindGuichan.cmake b/CMake/Modules/FindGuichan.cmake index 1623b00d..dbc863e2 100644 --- a/CMake/Modules/FindGuichan.cmake +++ b/CMake/Modules/FindGuichan.cmake @@ -85,6 +85,13 @@ FOREACH (COMPONENT ${Guichan_FIND_COMPONENTS}) MESSAGE(FATAL_ERROR "Could NOT find Guichan component ${COMPONENT}") ENDIF () + # Check guichan >= 0.8.0 by searching for the widgetlistener.hpp file. + SET(Guichan_HEADER "guichan/widgetlistener.hpp") + IF (NOT EXISTS ${Guichan_INCLUDE_DIR}/${Guichan_HEADER}) + SET(GUICHAN_FOUND FALSE) + MESSAGE(FATAL_ERROR "Guichan version is less than 0.8.0") + ENDIF() + IF (NOT Guichan_FIND_QUIETLY AND NOT Guichan_QUIET) MESSAGE(STATUS "Found Guichan ${COMPONENT}: ${Guichan_LIBRARY_${COMPONENT}}") ENDIF () diff --git a/configure.ac b/configure.ac index d1f375f6..b1ceceec 100755 --- a/configure.ac +++ b/configure.ac @@ -37,6 +37,9 @@ AC_MSG_ERROR([ *** Unable to find Guichan library (http://guichan.sf.net/)])) AC_CHECK_HEADERS([guichan.hpp], , AC_MSG_ERROR([ *** Guichan library found but cannot find headers (http://guichan.sf.net/)])) +AC_CHECK_HEADERS([guichan/widgetlistener.hpp], , +AC_MSG_ERROR([ *** Guichan library version is found but version is < 0.8.0 (http://guichan.sf.net/)])) + if test -n "$SDL_CONFIG"; then LIBS="$LIBS `$SDL_CONFIG --libs`" CPPFLAGS="$CPPFLAGS `$SDL_CONFIG --cflags`" |