diff options
| author | David Faure <faure@kde.org> | 2006-05-11 16:56:59 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2006-05-11 16:56:59 +0000 |
| commit | a1cd53cff402332c1bcf7a625b33d9330a247608 (patch) | |
| tree | c1e17c42054778348a4e176e6ec494b0a6068a01 /modules/FindGettext.cmake | |
| parent | d46f0af3b68dba8e3bb5461c5b5e37862309875d (diff) | |
| download | extra-cmake-modules-a1cd53cff402332c1bcf7a625b33d9330a247608.tar.gz extra-cmake-modules-a1cd53cff402332c1bcf7a625b33d9330a247608.tar.bz2 | |
Remove my CACHED_ hacks which break when people install libxml2 after seeing the error
message about it - only use the cache when the check was previously successful, as discussed.
svn path=/trunk/KDE/kdelibs/; revision=539759
Diffstat (limited to 'modules/FindGettext.cmake')
| -rw-r--r-- | modules/FindGettext.cmake | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/modules/FindGettext.cmake b/modules/FindGettext.cmake index fccd332f..e4dda701 100644 --- a/modules/FindGettext.cmake +++ b/modules/FindGettext.cmake @@ -10,14 +10,12 @@ # functionality can also reside in standalone Gettext library, or the one # embedded within kdelibs (cf. gettext.m4 from Gettext source). -IF (DEFINED CACHED_GETTEXT) +if (LIBC_HAS_DGETTEXT OR LIBINTL_HAS_DGETTEXT) # in cache already - IF ("${CACHED_GETTEXT}" STREQUAL "YES") - SET(GETTEXT_FOUND TRUE) - ENDIF ("${CACHED_GETTEXT}" STREQUAL "YES") + SET(GETTEXT_FOUND TRUE) -ELSE (DEFINED CACHED_GETTEXT) +else (LIBC_HAS_DGETTEXT OR LIBINTL_HAS_DGETTEXT) include(CheckIncludeFiles) include(CheckLibraryExists) @@ -49,19 +47,15 @@ ELSE (DEFINED CACHED_GETTEXT) endif (HAVE_LIBINTL_H) if (GETTEXT_FOUND) - set(CACHED_GETTEXT "YES") if (NOT Gettext_FIND_QUIETLY) message(STATUS "Found Gettext: ${GETTEXT_SOURCE}") endif (NOT Gettext_FIND_QUIETLY) else (GETTEXT_FOUND) if (Gettext_FIND_REQUIRED) message(STATUS "Could NOT find Gettext") - else (Gettext_FIND_REQUIRED) - set(CACHED_GETTEXT "NO") endif (Gettext_FIND_REQUIRED) endif (GETTEXT_FOUND) - set(CACHED_GETTEXT ${CACHED_GETTEXT} CACHE INTERNAL "If gettext was checked") MARK_AS_ADVANCED(GETTEXT_INCLUDE_DIR GETTEXT_LIBRARIES) -ENDIF(DEFINED CACHED_GETTEXT) +endif (LIBC_HAS_DGETTEXT OR LIBINTL_HAS_DGETTEXT) |