diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/FindACL.cmake | 8 | ||||
| -rw-r--r-- | modules/FindGSSAPI.cmake | 31 | ||||
| -rw-r--r-- | modules/FindLibXslt.cmake | 2 | ||||
| -rw-r--r-- | modules/FindLibintl.cmake | 2 | ||||
| -rw-r--r-- | modules/FindSharedMimeInfo.cmake | 3 |
5 files changed, 25 insertions, 21 deletions
diff --git a/modules/FindACL.cmake b/modules/FindACL.cmake index 2c515fdf..7d3fa14f 100644 --- a/modules/FindACL.cmake +++ b/modules/FindACL.cmake @@ -9,7 +9,7 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -INCLUDE(CheckIncludeFiles) +include(CheckIncludeFiles) check_include_files(attr/libattr.h HAVE_ATTR_LIBATTR_H) check_include_files(sys/xattr.h HAVE_SYS_XATTR_H) @@ -21,9 +21,9 @@ if (HAVE_ATTR_LIBATTR_H AND HAVE_SYS_XATTR_H AND HAVE_SYS_ACL_H AND HAVE_ACL_LIB endif (HAVE_ATTR_LIBATTR_H AND HAVE_SYS_XATTR_H AND HAVE_SYS_ACL_H AND HAVE_ACL_LIBACL_H) if (ACL_HEADERS_FOUND) - FIND_LIBRARY(ACL_LIBS NAMES acl ) + find_library(ACL_LIBS NAMES acl ) - FIND_LIBRARY(ATTR_LIBS NAMES attr ) + find_library(ATTR_LIBS NAMES attr ) endif (ACL_HEADERS_FOUND) if (ACL_HEADERS_FOUND AND ACL_LIBS AND ATTR_LIBS) @@ -32,5 +32,5 @@ if (ACL_HEADERS_FOUND AND ACL_LIBS AND ATTR_LIBS) message(STATUS "Found ACL support: ${ACL_LIBS}") endif (ACL_HEADERS_FOUND AND ACL_LIBS AND ATTR_LIBS) -MARK_AS_ADVANCED(ACL_LIBS) +mark_as_advanced(ACL_LIBS ATTR_LIBS) diff --git a/modules/FindGSSAPI.cmake b/modules/FindGSSAPI.cmake index 2ae17cd6..d79feea8 100644 --- a/modules/FindGSSAPI.cmake +++ b/modules/FindGSSAPI.cmake @@ -12,24 +12,25 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -IF(GSSAPI_LIBS AND GSSAPI_FLAVOR) +if(GSSAPI_LIBS AND GSSAPI_FLAVOR) # in cache already - SET(GSSAPI_FOUND TRUE) + set(GSSAPI_FOUND TRUE) -ELSE(GSSAPI_LIBS AND GSSAPI_FLAVOR) +else(GSSAPI_LIBS AND GSSAPI_FLAVOR) - FIND_PROGRAM(KRB5_CONFIG NAMES krb5-config PATHS + find_program(KRB5_CONFIG NAMES krb5-config PATHS /opt/local/bin ONLY_CMAKE_FIND_ROOT_PATH # this is required when cross compiling with cmake 2.6 and ignored with cmake 2.4, Alex ) + mark_as_advanced(KRB5_CONFIG) #reset vars set(GSSAPI_INCS) set(GSSAPI_LIBS) set(GSSAPI_FLAVOR) - IF(KRB5_CONFIG) + if(KRB5_CONFIG) SET(HAVE_KRB5_GSSAPI TRUE) EXEC_PROGRAM(${KRB5_CONFIG} ARGS --libs gssapi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GSSAPI_LIBS) @@ -52,26 +53,26 @@ ELSE(GSSAPI_LIBS AND GSSAPI_FLAVOR) IF(NOT HAVE_KRB5_GSSAPI) IF (gssapi_flavor_tmp MATCHES "Sun Microsystems.*") - MESSAGE(STATUS "Solaris Kerberos does not have GSSAPI; this is normal.") - SET(GSSAPI_LIBS) - SET(GSSAPI_INCS) + MESSAGE(STATUS "Solaris Kerberos does not have GSSAPI; this is normal.") + SET(GSSAPI_LIBS) + SET(GSSAPI_INCS) ELSE(gssapi_flavor_tmp MATCHES "Sun Microsystems.*") - MESSAGE(WARNING "${KRB5_CONFIG} failed unexpectedly.") + MESSAGE(WARNING "${KRB5_CONFIG} failed unexpectedly.") ENDIF(gssapi_flavor_tmp MATCHES "Sun Microsystems.*") ENDIF(NOT HAVE_KRB5_GSSAPI) - IF(GSSAPI_LIBS) # GSSAPI_INCS can be also empty, so don't rely on that - SET(GSSAPI_FOUND TRUE) + if(GSSAPI_LIBS) # GSSAPI_INCS can be also empty, so don't rely on that + set(GSSAPI_FOUND TRUE) message(STATUS "Found GSSAPI: ${GSSAPI_LIBS}") set(GSSAPI_INCS ${GSSAPI_INCS} CACHE STRING "The GSSAPI include directory" ) set(GSSAPI_LIBS ${GSSAPI_LIBS} CACHE STRING "The libraries needed to use GSSAPI" ) set(GSSAPI_FLAVOR ${GSSAPI_FLAVOR} CACHE STRING "The type of gss api, MIT or HEIMDAL") - MARK_AS_ADVANCED(GSSAPI_INCS GSSAPI_LIBS GSSAPI_FLAVOR) + mark_as_advanced(GSSAPI_INCS GSSAPI_LIBS GSSAPI_FLAVOR) - ENDIF(GSSAPI_LIBS) + endif(GSSAPI_LIBS) - ENDIF(KRB5_CONFIG) + endif(KRB5_CONFIG) -ENDIF(GSSAPI_LIBS AND GSSAPI_FLAVOR) +endif(GSSAPI_LIBS AND GSSAPI_FLAVOR) diff --git a/modules/FindLibXslt.cmake b/modules/FindLibXslt.cmake index 2c7f2551..f84f4c26 100644 --- a/modules/FindLibXslt.cmake +++ b/modules/FindLibXslt.cmake @@ -58,5 +58,5 @@ ELSE (LIBXSLT_FOUND) ENDIF (LibXslt_FIND_REQUIRED) ENDIF (LIBXSLT_FOUND) -MARK_AS_ADVANCED(LIBXSLT_INCLUDE_DIR LIBXSLT_LIBRARIES XSLTPROC_EXECUTABLE) +MARK_AS_ADVANCED(LIBXSLT_INCLUDE_DIR LIBXSLT_LIBRARIES LIBEXSLT_LIBRARIES XSLTPROC_EXECUTABLE) diff --git a/modules/FindLibintl.cmake b/modules/FindLibintl.cmake index b421ca85..1ddcbd82 100644 --- a/modules/FindLibintl.cmake +++ b/modules/FindLibintl.cmake @@ -43,4 +43,4 @@ endif(LIBINTL_INCLUDE_DIR) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Libintl DEFAULT_MSG LIBINTL_INCLUDE_DIR LIBINTL_LIB_FOUND) -mark_as_advanced(LIBINTL_INCLUDE_DIR LIBINTL_LIBRARIES LIBINTL_LIBC_HAS_DGETTEXT) +mark_as_advanced(LIBINTL_INCLUDE_DIR LIBINTL_LIBRARIES LIBINTL_LIBC_HAS_DGETTEXT LIBINTL_LIB_FOUND) diff --git a/modules/FindSharedMimeInfo.cmake b/modules/FindSharedMimeInfo.cmake index e3966b86..3ff8227c 100644 --- a/modules/FindSharedMimeInfo.cmake +++ b/modules/FindSharedMimeInfo.cmake @@ -51,6 +51,9 @@ else (UPDATE_MIME_DATABASE_EXECUTABLE) endif (UPDATE_MIME_DATABASE_EXECUTABLE) +mark_as_advanced(UPDATE_MIME_DATABASE_EXECUTABLE) + + macro(UPDATE_XDG_MIMETYPES _path) get_filename_component(_xdgmimeDir "${_path}" NAME) if("${_xdgmimeDir}" STREQUAL packages ) |