From 9e58ec2885d906c33006e4df0ec07de508afc2e4 Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Sun, 9 Jul 2017 16:35:44 -0400 Subject: Fix some variable detections for GSSAPI plugins --- 20025_all_mariadb-10.2.6-gssapi-detect.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/20025_all_mariadb-10.2.6-gssapi-detect.patch b/20025_all_mariadb-10.2.6-gssapi-detect.patch index b828a52..aeffff4 100644 --- a/20025_all_mariadb-10.2.6-gssapi-detect.patch +++ b/20025_all_mariadb-10.2.6-gssapi-detect.patch @@ -17,11 +17,11 @@ diff -aurN a/libmariadb/cmake/FindGSSAPI.cmake b/libmariadb/cmake/FindGSSAPI.cma + ENDIF() + ENDIF() + IF(GSSAPI_FOUND) -+ message(STATUS "Found GSSAPI: ${GSSAPI_LIBS}") ++ message(STATUS "Found GSSAPI: ${GSSAPI_LIBRARIES}") + -+ set(GSSAPI_INCS ${GSSAPI_INCLUDE_DIRS} CACHE STRING "") -+ set(GSSAPI_LIBS ${GSSAPI_LIBRARIES} CACHE STRING "") -+ set(GSSAPI_FLAVOR ${GSSAPI_FLAVOR} CACHE STRING "") ++ set(GSSAPI_INCS ${GSSAPI_INCLUDE_DIRS} CACHE STRING "" FORCE) ++ set(GSSAPI_LIBS ${GSSAPI_LIBRARIES} CACHE STRING "" FORCE) ++ set(GSSAPI_FLAVOR ${GSSAPI_FLAVOR} CACHE STRING "" FORCE) + + mark_as_advanced(GSSAPI_INCS GSSAPI_LIBS GSSAPI_FLAVOR) + RETURN() @@ -50,11 +50,11 @@ diff -aurN a/plugin/auth_gssapi/cmake/FindGSSAPI.cmake b/plugin/auth_gssapi/cmak + ENDIF() + ENDIF() + IF(GSSAPI_FOUND) -+ message(STATUS "Found GSSAPI: ${GSSAPI_LIBS}") ++ message(STATUS "Found GSSAPI: ${GSSAPI_LIBRARIES}") + -+ set(GSSAPI_INCS ${GSSAPI_INCLUDE_DIRS} CACHE STRING "") -+ set(GSSAPI_LIBS ${GSSAPI_LIBRARIES} CACHE STRING "") -+ set(GSSAPI_FLAVOR ${GSSAPI_FLAVOR} CACHE STRING "") ++ set(GSSAPI_INCS ${GSSAPI_INCLUDE_DIRS} CACHE STRING "" FORCE) ++ set(GSSAPI_LIBS ${GSSAPI_LIBRARIES} CACHE STRING "" FORCE) ++ set(GSSAPI_FLAVOR ${GSSAPI_FLAVOR} CACHE STRING "" FORCE) + + mark_as_advanced(GSSAPI_INCS GSSAPI_LIBS GSSAPI_FLAVOR) + RETURN() -- cgit v1.2.3-65-gdbad