From d57764111fcfd11b2d847b78ceb91444f5ce889e Mon Sep 17 00:00:00 2001 From: uwolfer Date: Sat, 27 Sep 2008 09:06:40 +0000 Subject: [PATCH] Improve cmake check for NX detection. Patch by Andreas Pakulat. CCMAIL:apaku@gmx.de git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdenetwork@865252 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- cmake/modules/FindLibNXCL.cmake | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cmake/modules/FindLibNXCL.cmake b/cmake/modules/FindLibNXCL.cmake index e573fa7f3..d2e59a67c 100644 --- a/cmake/modules/FindLibNXCL.cmake +++ b/cmake/modules/FindLibNXCL.cmake @@ -18,18 +18,21 @@ FIND_LIBRARY(LIBNXCL_LIBRARIES NAMES nxcl libnxcl) IF (LIBNXCL_INCLUDE_DIR AND LIBNXCL_LIBRARIES) SET(CMAKE_REQUIRED_LIBRARIES "${LIBNXCL_LIBRARIES}" "${CMAKE_REQUIRED_LIBRARIES}") SET(CMAKE_REQUIRED_INCLUDES "${LIBNXCL_INCLUDE_DIR}" "${CMAKE_REQUIRED_INCLUDES}") - CHECK_STRUCT_MEMBER(nxcl::NXClientLib "getNXSSHProcess()" nxcl/nxclientlib.h LIBNXCL_FOUND) + CHECK_STRUCT_MEMBER(nxcl::NXClientLib "getNXSSHProcess()" nxcl/nxclientlib.h LIBNXCL_NXSSHPROCESS_FOUND) + CHECK_STRUCT_MEMBER(nxcl::NXClientLib "getXID()" nxcl/nxclientlib.h LIBNXCL_XID_FOUND) ENDIF (LIBNXCL_INCLUDE_DIR AND LIBNXCL_LIBRARIES) -IF (LIBNXCL_FOUND) +IF (LIBNXCL_NXSSHPROCESS_FOUND AND LIBNXCL_XID_FOUND) + SET(LIBNXCL_FOUND TRUE) IF (NOT LIBNXCL_FIND_QUIETLY) MESSAGE(STATUS "Found LibNXCL: ${LIBNXCL_LIBRARIES}") ENDIF (NOT LIBNXCL_FIND_QUIETLY) -ELSE (LIBNXCL_FOUND) +ELSE (LIBNXCL_NXSSHPROCESS_FOUND AND LIBNXCL_XID_FOUND) + SET(LIBNXCL_FOUND FALSE) IF (LIBNXCL_FIND_REQUIRED) MESSAGE(FATAL_ERROR "Could NOT find acceptable version of LibNXCL (version 1.0).") ENDIF (LIBNXCL_FIND_REQUIRED) -ENDIF (LIBNXCL_FOUND) +ENDIF (LIBNXCL_NXSSHPROCESS_FOUND AND LIBNXCL_XID_FOUND) MARK_AS_ADVANCED(LIBNXCL_INCLUDE_DIR LIBNXCL_LIBRARIES) -- 2.11.4.GIT