From 6059e6c2471477fccf24d5054f9f62b71672345b Mon Sep 17 00:00:00 2001 From: Pino Toscano Date: Tue, 21 Mar 2006 23:32:31 +0000 Subject: Preliminary module for the GSSAPI configuration. It seems to work nicely, altough some thing are still missing. svn path=/trunk/KDE/kdelibs/; revision=521231 --- modules/FindGSSAPI.cmake | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 modules/FindGSSAPI.cmake (limited to 'modules/FindGSSAPI.cmake') diff --git a/modules/FindGSSAPI.cmake b/modules/FindGSSAPI.cmake new file mode 100644 index 00000000..f574602e --- /dev/null +++ b/modules/FindGSSAPI.cmake @@ -0,0 +1,48 @@ +# - Try to detect the GSSAPI support +# Once done this will define +# +# GSSAPI_FOUND - system supports GSSAPI +# GSSAPI_INCS - the CSSAPI include directory +# GSSAPI_LIBS - the libraries needed to use GSSAPI +# GSSAPI_RPATH - the rpath for GSSAPI + +# TODO: RPATH + +FIND_PROGRAM(KRB5_CONFIG NAMES krb5-config PATHS + /usr/bin + /usr/local/bin + /opt/local/bin +) + +#reset vars +set(GSSAPI_INCS) +set(GSSAPI_LIBS) +set(GSSAPI_FLAVOR) + +IF(KRB5_CONFIG) + + EXEC_PROGRAM(${KRB5_CONFIG} ARGS --libs gssapi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GSSAPI_LIBS) + + EXEC_PROGRAM(${KRB5_CONFIG} ARGS --cflags gssapi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GSSAPI_INCS) + STRING(REGEX REPLACE "(\r?\n)+$" "" GSSAPI_INCS "${GSSAPI_INCS}") + + 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_LIBS) # GSSAPI_INCS can be also empty, so don't rely on that + SET(GSSAPI_FOUND TRUE) + message(STATUS "Found GSSAPI: ${GSSAPI_LIBS}") + ENDIF(GSSAPI_LIBS) + +#ELSE(KRB5_CONFIG) + +# TODO... + +ENDIF(KRB5_CONFIG) + +MARK_AS_ADVANCED(GSSAPI_INCS GSSAPI_LIBS GSSAPI_FLAVOR) -- cgit v1.2.1 From 2b43aad081d13bdeb2ed8a65f65fbecfb470da0d Mon Sep 17 00:00:00 2001 From: David Faure Date: Tue, 18 Apr 2006 11:22:38 +0000 Subject: More use of the cache; fixing previous commit to not recheck everytime when something isn't available (e.g. agg for me). svn path=/trunk/KDE/kdelibs/; revision=531000 --- modules/FindGSSAPI.cmake | 85 +++++++++++++++++++++++++++++------------------- 1 file changed, 52 insertions(+), 33 deletions(-) (limited to 'modules/FindGSSAPI.cmake') diff --git a/modules/FindGSSAPI.cmake b/modules/FindGSSAPI.cmake index f574602e..7ef66a0a 100644 --- a/modules/FindGSSAPI.cmake +++ b/modules/FindGSSAPI.cmake @@ -2,47 +2,66 @@ # Once done this will define # # GSSAPI_FOUND - system supports GSSAPI -# GSSAPI_INCS - the CSSAPI include directory +# GSSAPI_INCS - the GSSAPI include directory # GSSAPI_LIBS - the libraries needed to use GSSAPI -# GSSAPI_RPATH - the rpath for GSSAPI +# GSSAPI_FLAVOR - the type of API - MIT or HEIMDAL -# TODO: RPATH +IF (DEFINED CACHED_GSSAPI) -FIND_PROGRAM(KRB5_CONFIG NAMES krb5-config PATHS - /usr/bin - /usr/local/bin - /opt/local/bin -) - -#reset vars -set(GSSAPI_INCS) -set(GSSAPI_LIBS) -set(GSSAPI_FLAVOR) - -IF(KRB5_CONFIG) + # in cache already + IF ("${CACHED_GSSAPI}" STREQUAL "YES") + SET(GSSAPI_FOUND TRUE) + ENDIF ("${CACHED_GSSAPI}" STREQUAL "YES") - EXEC_PROGRAM(${KRB5_CONFIG} ARGS --libs gssapi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GSSAPI_LIBS) +ELSE (DEFINED CACHED_GSSAPI) - EXEC_PROGRAM(${KRB5_CONFIG} ARGS --cflags gssapi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GSSAPI_INCS) - STRING(REGEX REPLACE "(\r?\n)+$" "" GSSAPI_INCS "${GSSAPI_INCS}") + FIND_PROGRAM(KRB5_CONFIG NAMES krb5-config PATHS + /usr/bin + /usr/local/bin + /opt/local/bin + ) + + #reset vars + set(GSSAPI_INCS) + set(GSSAPI_LIBS) + set(GSSAPI_FLAVOR) + + IF(KRB5_CONFIG) + + EXEC_PROGRAM(${KRB5_CONFIG} ARGS --libs gssapi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GSSAPI_LIBS) + + EXEC_PROGRAM(${KRB5_CONFIG} ARGS --cflags gssapi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GSSAPI_INCS) + STRING(REGEX REPLACE "(\r?\n)+$" "" GSSAPI_INCS "${GSSAPI_INCS}") + + 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_LIBS) # GSSAPI_INCS can be also empty, so don't rely on that + SET(CACHED_GSSAPI "YES") + SET(GSSAPI_FOUND TRUE) + message(STATUS "Found GSSAPI: ${GSSAPI_LIBS}") - 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.*") + 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") - 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}") - ENDIF(GSSAPI_LIBS) + MARK_AS_ADVANCED(GSSAPI_INCS GSSAPI_LIBS GSSAPI_FLAVOR) -#ELSE(KRB5_CONFIG) + ELSE(GSSAPI_LIBS) + SET(CACHED_GSSAPI "NO") + ENDIF(GSSAPI_LIBS) + + ELSE(KRB5_CONFIG) -# TODO... + SET(CACHED_GSSAPI "NO") -ENDIF(KRB5_CONFIG) + ENDIF(KRB5_CONFIG) + + set(CACHED_GSSAPI ${CACHED_GSSAPI} CACHE INTERNAL "If gssapi (krb5) was checked") -MARK_AS_ADVANCED(GSSAPI_INCS GSSAPI_LIBS GSSAPI_FLAVOR) +ENDIF (DEFINED CACHED_GSSAPI) -- cgit v1.2.1 From 322936fe1154a3b632b6b8e2e7bf50c8d9eaf0ed Mon Sep 17 00:00:00 2001 From: David Faure Date: Tue, 18 Apr 2006 16:17:42 +0000 Subject: -I doesn't belong in _INCS. The other solution would be to use add_definitions instead of include_directories, but then we lose the automatic removal of -I/usr/include for instance. svn path=/trunk/KDE/kdelibs/; revision=531167 --- modules/FindGSSAPI.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/FindGSSAPI.cmake') diff --git a/modules/FindGSSAPI.cmake b/modules/FindGSSAPI.cmake index 7ef66a0a..2e4e0b74 100644 --- a/modules/FindGSSAPI.cmake +++ b/modules/FindGSSAPI.cmake @@ -32,6 +32,7 @@ ELSE (DEFINED CACHED_GSSAPI) 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) set(GSSAPI_FLAVOR_MIT) -- cgit v1.2.1 From 810cb50e578d060393027c8e5d37ede287b04807 Mon Sep 17 00:00:00 2001 From: David Faure Date: Tue, 18 Apr 2006 20:21:08 +0000 Subject: Turn "-Ifoo -Ibar" into "foo;bar", as expected by include_directories. svn path=/trunk/KDE/kdelibs/; revision=531255 --- modules/FindGSSAPI.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/FindGSSAPI.cmake') diff --git a/modules/FindGSSAPI.cmake b/modules/FindGSSAPI.cmake index 2e4e0b74..a89d6181 100644 --- a/modules/FindGSSAPI.cmake +++ b/modules/FindGSSAPI.cmake @@ -31,9 +31,9 @@ ELSE (DEFINED CACHED_GSSAPI) EXEC_PROGRAM(${KRB5_CONFIG} ARGS --libs gssapi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GSSAPI_LIBS) 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}") - + 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) set(GSSAPI_FLAVOR_MIT) IF(gssapi_flavor_tmp MATCHES ".*Massachusetts.*") -- cgit v1.2.1 From a1cd53cff402332c1bcf7a625b33d9330a247608 Mon Sep 17 00:00:00 2001 From: David Faure Date: Thu, 11 May 2006 16:56:59 +0000 Subject: 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 --- modules/FindGSSAPI.cmake | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'modules/FindGSSAPI.cmake') diff --git a/modules/FindGSSAPI.cmake b/modules/FindGSSAPI.cmake index a89d6181..8fd65a18 100644 --- a/modules/FindGSSAPI.cmake +++ b/modules/FindGSSAPI.cmake @@ -6,14 +6,12 @@ # GSSAPI_LIBS - the libraries needed to use GSSAPI # GSSAPI_FLAVOR - the type of API - MIT or HEIMDAL -IF (DEFINED CACHED_GSSAPI) +IF(GSSAPI_LIBS AND GSSAPI_FLAVOR) # in cache already - IF ("${CACHED_GSSAPI}" STREQUAL "YES") - SET(GSSAPI_FOUND TRUE) - ENDIF ("${CACHED_GSSAPI}" STREQUAL "YES") + SET(GSSAPI_FOUND TRUE) -ELSE (DEFINED CACHED_GSSAPI) +ELSE(GSSAPI_LIBS AND GSSAPI_FLAVOR) FIND_PROGRAM(KRB5_CONFIG NAMES krb5-config PATHS /usr/bin @@ -43,7 +41,6 @@ ELSE (DEFINED CACHED_GSSAPI) ENDIF(gssapi_flavor_tmp MATCHES ".*Massachusetts.*") IF(GSSAPI_LIBS) # GSSAPI_INCS can be also empty, so don't rely on that - SET(CACHED_GSSAPI "YES") SET(GSSAPI_FOUND TRUE) message(STATUS "Found GSSAPI: ${GSSAPI_LIBS}") @@ -53,16 +50,8 @@ ELSE (DEFINED CACHED_GSSAPI) MARK_AS_ADVANCED(GSSAPI_INCS GSSAPI_LIBS GSSAPI_FLAVOR) - ELSE(GSSAPI_LIBS) - SET(CACHED_GSSAPI "NO") ENDIF(GSSAPI_LIBS) - ELSE(KRB5_CONFIG) - - SET(CACHED_GSSAPI "NO") - ENDIF(KRB5_CONFIG) - - set(CACHED_GSSAPI ${CACHED_GSSAPI} CACHE INTERNAL "If gssapi (krb5) was checked") -ENDIF (DEFINED CACHED_GSSAPI) +ENDIF(GSSAPI_LIBS AND GSSAPI_FLAVOR) -- cgit v1.2.1 From c778596920e0d5357f216c885e35b4f97d371a23 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 9 Sep 2006 10:18:35 +0000 Subject: added copyright notice everywhere. Now they all are BSD-licensed, as copyright holder I inserted everywhere the one who added it to svn (or Kitware if it is an enhanced copy from taken cmake) Some developers committed quite often but were not the ones who added the file, if you feel you have also copyright on the file add your name in the specific file. Copyright holders: CCMAIL: montel@kde.org CCMAIL: toscano.pino@tiscali.it CCMAIL: adymo@kdevelop.org CCMAIL: ranger@befunk.com CCMAIL: zack@kde.org CCMAIL: caslav.ilic@gmx.net CCMAIL: syntheticpp@yahoo.com CCMAIL: js@iidea.pl CCMAIL: michael.larouche@kdemail.net CCMAIL: ossi@kde.org CCMAIL: faure@kde.org Committers, but no files added so that they are not listed as copyright holders: CCMAIL: ch.ehrlicher@gmx.de CCMAIL: winter@kde.org CCMAIL: ralf.habacker@freenet.de CCMAIL: moura@kdewebdev.org CCMAIL: kde-buildsystem@kde.org Alex svn path=/trunk/KDE/kdelibs/; revision=582410 --- modules/FindGSSAPI.cmake | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'modules/FindGSSAPI.cmake') diff --git a/modules/FindGSSAPI.cmake b/modules/FindGSSAPI.cmake index 8fd65a18..daf16113 100644 --- a/modules/FindGSSAPI.cmake +++ b/modules/FindGSSAPI.cmake @@ -5,6 +5,12 @@ # GSSAPI_INCS - the GSSAPI include directory # GSSAPI_LIBS - the libraries needed to use GSSAPI # GSSAPI_FLAVOR - the type of API - MIT or HEIMDAL +# +# Copyright (c) 2006, Pino Toscano, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + IF(GSSAPI_LIBS AND GSSAPI_FLAVOR) -- cgit v1.2.1 From 00db3e5a85410ec7cfba9b08c3976b5a217d5797 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 5 Jun 2007 01:41:47 +0000 Subject: -/usr/lib, /usr/local/lib, /usr/include, /usr/local/include don't have to be listed explicitely, they are searched automatically -some more consisten lower casing and indentation Alex svn path=/trunk/KDE/kdelibs/; revision=671570 --- modules/FindGSSAPI.cmake | 2 -- 1 file changed, 2 deletions(-) (limited to 'modules/FindGSSAPI.cmake') diff --git a/modules/FindGSSAPI.cmake b/modules/FindGSSAPI.cmake index daf16113..64182fdc 100644 --- a/modules/FindGSSAPI.cmake +++ b/modules/FindGSSAPI.cmake @@ -20,8 +20,6 @@ IF(GSSAPI_LIBS AND GSSAPI_FLAVOR) ELSE(GSSAPI_LIBS AND GSSAPI_FLAVOR) FIND_PROGRAM(KRB5_CONFIG NAMES krb5-config PATHS - /usr/bin - /usr/local/bin /opt/local/bin ) -- cgit v1.2.1 From c6204d8966e3359915185d5f5b8018db1b6857a5 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 20 Aug 2007 15:00:00 +0000 Subject: Not all krb5 implementations have GSSAPI; the krb5-config script then returns an error message which isn't a useful library name svn path=/trunk/KDE/kdelibs/; revision=702399 --- modules/FindGSSAPI.cmake | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'modules/FindGSSAPI.cmake') diff --git a/modules/FindGSSAPI.cmake b/modules/FindGSSAPI.cmake index 64182fdc..36dffc85 100644 --- a/modules/FindGSSAPI.cmake +++ b/modules/FindGSSAPI.cmake @@ -30,7 +30,12 @@ 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) EXEC_PROGRAM(${KRB5_CONFIG} ARGS --cflags gssapi RETURN_VALUE _return_VALUE OUTPUT_VARIABLE GSSAPI_INCS) string(REGEX REPLACE "(\r?\n)+$" "" GSSAPI_INCS "${GSSAPI_INCS}") @@ -44,6 +49,16 @@ ELSE(GSSAPI_LIBS AND GSSAPI_FLAVOR) 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(GSSAPI_LIBS) # GSSAPI_INCS can be also empty, so don't rely on that SET(GSSAPI_FOUND TRUE) message(STATUS "Found GSSAPI: ${GSSAPI_LIBS}") -- cgit v1.2.1 From 814455b7ad321c88e730662fda58261087b72e72 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 18 Feb 2008 19:06:32 +0000 Subject: some improvements to the docs: -some modules were not at all documented, only few are left now -the copyright message doesn't have to be printed for every module in the docs -fix FindKorundom.cmake, it didn't follow the style guide and had typos (e.g. Korumdum_FOUND instead of KORUNDUM_FOUND) Alex (will commit modified FindKDE4Internal.cmake after Christians commit) svn path=/trunk/KDE/kdelibs/; revision=776742 --- modules/FindGSSAPI.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindGSSAPI.cmake') diff --git a/modules/FindGSSAPI.cmake b/modules/FindGSSAPI.cmake index 36dffc85..90e803ea 100644 --- a/modules/FindGSSAPI.cmake +++ b/modules/FindGSSAPI.cmake @@ -5,7 +5,7 @@ # GSSAPI_INCS - the GSSAPI include directory # GSSAPI_LIBS - the libraries needed to use GSSAPI # GSSAPI_FLAVOR - the type of API - MIT or HEIMDAL -# + # Copyright (c) 2006, Pino Toscano, # # Redistribution and use is allowed according to the terms of the BSD license. -- cgit v1.2.1 From 831f6d88722b8cf1a4168ea1ab6d269c5cc3c1cf Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 18 Mar 2008 21:08:26 +0000 Subject: -help cross compiling, search the krb5-config executable only in the target environment, the one from the build host isn't the right one Alex svn path=/trunk/KDE/kdelibs/; revision=787239 --- modules/FindGSSAPI.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/FindGSSAPI.cmake') diff --git a/modules/FindGSSAPI.cmake b/modules/FindGSSAPI.cmake index 90e803ea..2ae17cd6 100644 --- a/modules/FindGSSAPI.cmake +++ b/modules/FindGSSAPI.cmake @@ -21,6 +21,7 @@ ELSE(GSSAPI_LIBS AND GSSAPI_FLAVOR) 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 ) #reset vars -- cgit v1.2.1 From 9197e55392ed66b784cb719e202a24f78cd03c58 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Thu, 3 Apr 2008 22:12:21 +0000 Subject: -mark some variables as advanced, so they don't appear in the not-advanced view of cmake-gui and ccmake -some minor cosmetics (casing and spaces vs. tabs) Alex svn path=/trunk/KDE/kdelibs/; revision=793410 --- modules/FindGSSAPI.cmake | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'modules/FindGSSAPI.cmake') 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) -- cgit v1.2.1 From fcc15dd97379ef210f356f4ed92bd5a290404ae3 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Mon, 14 Apr 2008 19:55:19 +0000 Subject: remove CACHE STRING here too svn path=/trunk/KDE/kdelibs/; revision=797051 --- modules/FindGSSAPI.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/FindGSSAPI.cmake') diff --git a/modules/FindGSSAPI.cmake b/modules/FindGSSAPI.cmake index d79feea8..91c457e6 100644 --- a/modules/FindGSSAPI.cmake +++ b/modules/FindGSSAPI.cmake @@ -65,8 +65,8 @@ else(GSSAPI_LIBS AND GSSAPI_FLAVOR) 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_INCS ${GSSAPI_INCS}) + set(GSSAPI_LIBS ${GSSAPI_LIBS}) set(GSSAPI_FLAVOR ${GSSAPI_FLAVOR} CACHE STRING "The type of gss api, MIT or HEIMDAL") mark_as_advanced(GSSAPI_INCS GSSAPI_LIBS GSSAPI_FLAVOR) -- cgit v1.2.1 From 9215cdab458b5fdc16343157dacd78ef82245ae1 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Wed, 16 Apr 2008 20:37:25 +0000 Subject: don't put set variables into the CACHE, per Brad King svn path=/trunk/KDE/kdelibs/; revision=797757 --- modules/FindGSSAPI.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindGSSAPI.cmake') 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) -- cgit v1.2.1 From 5d69cd884cefe000851884ea9c3f3ec851fe4122 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sun, 20 Jul 2008 10:26:08 +0000 Subject: 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 --- modules/FindGSSAPI.cmake | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'modules/FindGSSAPI.cmake') 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) -- cgit v1.2.1