diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2008-07-20 10:26:08 +0000 | 
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2008-07-20 10:26:08 +0000 | 
| commit | 5d69cd884cefe000851884ea9c3f3ec851fe4122 (patch) | |
| tree | 3a72e3a940ae1bbb5a66d1c482078cc6861aacf5 /modules/FindGSSAPI.cmake | |
| parent | e30c2c3ff44d43c179c891fe94d1e2fe9f5b7873 (diff) | |
| download | extra-cmake-modules-5d69cd884cefe000851884ea9c3f3ec851fe4122.tar.gz extra-cmake-modules-5d69cd884cefe000851884ea9c3f3ec851fe4122.tar.bz2 | |
FindPCRE.cmake: lowercasing
FindSharedMimeInfo.cmake: document SHARED_MIME_INFO_MINIMUM_VERSION and add a comment about the WORKING_DIRECTORY
FindGStreamer.cmake: use FIND_PACKAGE_HANDLE_STANDARD_ARGS()
FindExiv2.cmake: lowercasing, document EXIV2_MIN_VERSION
FindKDE4Internal.cmake: remove empty lines from documentation block so everything is included again in the generated documentation
Alex
svn path=/trunk/KDE/kdelibs/; revision=835253
Diffstat (limited to 'modules/FindGSSAPI.cmake')
| -rw-r--r-- | modules/FindGSSAPI.cmake | 44 | 
1 files changed, 22 insertions, 22 deletions
| diff --git a/modules/FindGSSAPI.cmake b/modules/FindGSSAPI.cmake index 45e4e0e1..0951c675 100644 --- a/modules/FindGSSAPI.cmake +++ b/modules/FindGSSAPI.cmake @@ -32,34 +32,34 @@ else(GSSAPI_LIBS AND GSSAPI_FLAVOR)    if(KRB5_CONFIG) -    SET(HAVE_KRB5_GSSAPI TRUE) -    EXEC_PROGRAM(${KRB5_CONFIG} ARGS --libs gssapi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GSSAPI_LIBS) -    IF(_return_VALUE) -      MESSAGE(STATUS "GSSAPI configure check failed.") -      SET(HAVE_KRB5_GSSAPI FALSE) -    ENDIF(_return_VALUE) +    set(HAVE_KRB5_GSSAPI TRUE) +    exec_program(${KRB5_CONFIG} ARGS --libs gssapi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GSSAPI_LIBS) +    if(_return_VALUE) +      message(STATUS "GSSAPI configure check failed.") +      set(HAVE_KRB5_GSSAPI FALSE) +    endif(_return_VALUE) -    EXEC_PROGRAM(${KRB5_CONFIG} ARGS --cflags gssapi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GSSAPI_INCS) +    exec_program(${KRB5_CONFIG} ARGS --cflags gssapi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GSSAPI_INCS)      string(REGEX REPLACE "(\r?\n)+$" "" GSSAPI_INCS "${GSSAPI_INCS}")      string(REGEX REPLACE " *-I" ";" GSSAPI_INCS "${GSSAPI_INCS}") -    EXEC_PROGRAM(${KRB5_CONFIG} ARGS --vendor RETURN_VALUE _return_VALUE OUTPUT_VARIABLE gssapi_flavor_tmp) +    exec_program(${KRB5_CONFIG} ARGS --vendor RETURN_VALUE _return_VALUE OUTPUT_VARIABLE gssapi_flavor_tmp)      set(GSSAPI_FLAVOR_MIT) -    IF(gssapi_flavor_tmp MATCHES ".*Massachusetts.*") -      SET(GSSAPI_FLAVOR "MIT") -    ELSE(gssapi_flavor_tmp MATCHES ".*Massachusetts.*") -      SET(GSSAPI_FLAVOR "HEIMDAL") -    ENDIF(gssapi_flavor_tmp MATCHES ".*Massachusetts.*") +    if(gssapi_flavor_tmp MATCHES ".*Massachusetts.*") +      set(GSSAPI_FLAVOR "MIT") +    else(gssapi_flavor_tmp MATCHES ".*Massachusetts.*") +      set(GSSAPI_FLAVOR "HEIMDAL") +    endif(gssapi_flavor_tmp MATCHES ".*Massachusetts.*") -    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) -      ELSE(gssapi_flavor_tmp MATCHES "Sun Microsystems.*") -         MESSAGE(WARNING "${KRB5_CONFIG} failed unexpectedly.") -      ENDIF(gssapi_flavor_tmp MATCHES "Sun Microsystems.*") -    ENDIF(NOT HAVE_KRB5_GSSAPI) +    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) +      else(gssapi_flavor_tmp MATCHES "Sun Microsystems.*") +         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) | 
