diff options
| -rw-r--r-- | modules/FindAkode.cmake | 4 | ||||
| -rw-r--r-- | modules/FindFFmpeg.cmake | 2 | ||||
| -rw-r--r-- | modules/FindFontconfig.cmake | 2 | ||||
| -rw-r--r-- | modules/FindGSSAPI.cmake | 2 | ||||
| -rw-r--r-- | modules/FindGettext.cmake | 2 | ||||
| -rw-r--r-- | modules/FindLibintl.cmake | 4 | ||||
| -rw-r--r-- | modules/FindOpenEXR.cmake | 2 | ||||
| -rw-r--r-- | modules/FindStrigi.cmake | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/modules/FindAkode.cmake b/modules/FindAkode.cmake index 9e66eb36..9df503cc 100644 --- a/modules/FindAkode.cmake +++ b/modules/FindAkode.cmake @@ -34,8 +34,8 @@ ELSE (AKODE_LIBRARIES AND AKODE_INCLUDE_DIR) ENDIF (AKODE_LIBRARIES AND AKODE_INCLUDE_DIR) # ensure that they are cached - set(AKODE_INCLUDE_DIR ${AKODE_INCLUDE_DIR} CACHE INTERNAL "The akode include path") - set(AKODE_LIBRARIES ${AKODE_LIBRARIES} CACHE INTERNAL "The libraries needed to use libraries") + set(AKODE_INCLUDE_DIR ${AKODE_INCLUDE_DIR}) + set(AKODE_LIBRARIES ${AKODE_LIBRARIES}) ENDIF (AKODECONFIG_EXECUTABLE) IF(AKODE_FOUND) diff --git a/modules/FindFFmpeg.cmake b/modules/FindFFmpeg.cmake index 9768949d..83f4dde8 100644 --- a/modules/FindFFmpeg.cmake +++ b/modules/FindFFmpeg.cmake @@ -24,7 +24,7 @@ IF (NOT WIN32) PKGCONFIG(libavcodec _FFMPEGIncDir _FFMPEGLinkDir _FFMPEGLinkFlags _FFMPEGCflags) ENDIF (NOT WIN32) - #set(FFMPEG_DEFINITIONS ${_FFMPEGCflags} CACHE INTERNAL "The compilation flags for ffmpeg") + #set(FFMPEG_DEFINITIONS ${_FFMPEGCflags}) find_path(FFMPEG_INCLUDE_DIR ffmpeg/avcodec.h PATHS diff --git a/modules/FindFontconfig.cmake b/modules/FindFontconfig.cmake index c6a8c6ab..ad144e1e 100644 --- a/modules/FindFontconfig.cmake +++ b/modules/FindFontconfig.cmake @@ -25,7 +25,7 @@ else (FONTCONFIG_LIBRARIES AND FONTCONFIG_INCLUDE_DIR) pkgconfig(fontconfig _FONTCONFIGIncDir _FONTCONFIGLinkDir _FONTCONFIGLinkFlags _FONTCONFIGCflags) - set(FONTCONFIG_DEFINITIONS ${_FONTCONFIGCflags} CACHE INTERNAL "The compilation flags for fontconfig") + set(FONTCONFIG_DEFINITIONS ${_FONTCONFIGCflags}) endif (NOT WIN32) find_path(FONTCONFIG_INCLUDE_DIR fontconfig/fontconfig.h diff --git a/modules/FindGSSAPI.cmake b/modules/FindGSSAPI.cmake index 91c457e6..45e4e0e1 100644 --- a/modules/FindGSSAPI.cmake +++ b/modules/FindGSSAPI.cmake @@ -67,7 +67,7 @@ else(GSSAPI_LIBS AND GSSAPI_FLAVOR) set(GSSAPI_INCS ${GSSAPI_INCS}) set(GSSAPI_LIBS ${GSSAPI_LIBS}) - set(GSSAPI_FLAVOR ${GSSAPI_FLAVOR} CACHE STRING "The type of gss api, MIT or HEIMDAL") + set(GSSAPI_FLAVOR ${GSSAPI_FLAVOR}) mark_as_advanced(GSSAPI_INCS GSSAPI_LIBS GSSAPI_FLAVOR) diff --git a/modules/FindGettext.cmake b/modules/FindGettext.cmake index 682906e5..8c50e43f 100644 --- a/modules/FindGettext.cmake +++ b/modules/FindGettext.cmake @@ -43,7 +43,7 @@ else (LIBC_HAS_DGETTEXT OR LIBINTL_HAS_DGETTEXT) CHECK_LIBRARY_EXISTS(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT) if (LIBINTL_HAS_DGETTEXT) set(GETTEXT_SOURCE "in ${LIBINTL_LIBRARY}") - set(GETTEXT_LIBRARIES ${LIBINTL_LIBRARY} CACHE FILEPATH "path to libintl library, used for gettext") + set(GETTEXT_LIBRARIES ${LIBINTL_LIBRARY}) set(GETTEXT_FOUND TRUE) endif (LIBINTL_HAS_DGETTEXT) endif (LIBC_HAS_DGETTEXT) diff --git a/modules/FindLibintl.cmake b/modules/FindLibintl.cmake index 1ddcbd82..52ae6479 100644 --- a/modules/FindLibintl.cmake +++ b/modules/FindLibintl.cmake @@ -30,11 +30,11 @@ if(LIBINTL_INCLUDE_DIR) if (LIBINTL_LIBC_HAS_DGETTEXT) set(LIBINTL_LIBRARIES) - set(LIBINTL_LIB_FOUND TRUE CACHE BOOL "Libintl found" FORCE) + set(LIBINTL_LIB_FOUND TRUE) else (LIBINTL_LIBC_HAS_DGETTEXT) find_library(LIBINTL_LIBRARIES NAMES intl libintl ) if(LIBINTL_LIBRARIES) - set(LIBINTL_LIB_FOUND TRUE CACHE BOOL "Libintl found" FORCE) + set(LIBINTL_LIB_FOUND TRUE) endif(LIBINTL_LIBRARIES) endif (LIBINTL_LIBC_HAS_DGETTEXT) diff --git a/modules/FindOpenEXR.cmake b/modules/FindOpenEXR.cmake index ac58b345..35b7e001 100644 --- a/modules/FindOpenEXR.cmake +++ b/modules/FindOpenEXR.cmake @@ -79,7 +79,7 @@ ENDIF (NOT WIN32) set(_OPENEXR_DEFINITIONS) endif (WIN32) - set(OPENEXR_DEFINITIONS ${_OPENEXR_DEFINITIONS} CACHE STRING "Definitions needed to use OpenEXR") + set(OPENEXR_DEFINITIONS ${_OPENEXR_DEFINITIONS}) endif (OPENEXR_INCLUDE_DIR AND OPENEXR_IMATH_LIBRARY AND OPENEXR_ILMIMF_LIBRARY AND OPENEXR_IEX_LIBRARY AND OPENEXR_HALF_LIBRARY) diff --git a/modules/FindStrigi.cmake b/modules/FindStrigi.cmake index 8772731b..12373860 100644 --- a/modules/FindStrigi.cmake +++ b/modules/FindStrigi.cmake @@ -89,7 +89,7 @@ if (NOT WIN32 AND NOT HAVE_STRIGI_VERSION) message(STATUS "pkg-config query failed. did you set $PKG_CONFIG_PATH to the directory where strigi libstreamanalyzer.pc is installed?") message(FATAL_ERROR "Didn't find strigi >= ${STRIGI_MIN_VERSION}") else(NOT _return_VALUE STREQUAL "0") - set(HAVE_STRIGI_VERSION TRUE CACHE BOOL "Have strigi version returned by pkgconfig") + set(HAVE_STRIGI_VERSION TRUE) if(NOT Strigi_FIND_QUIETLY) message(STATUS "Found Strigi >= ${STRIGI_MIN_VERSION}") endif(NOT Strigi_FIND_QUIETLY) |