QuasarApp/qca
4
0
Fork 0
mirror of https://github.com/QuasarApp/qca.git synced 2025-04-27 12:04:31 +00:00
Code Issues Projects Releases Wiki Activity

Update the NSS module so it has a chance to work, and

Browse Source 
drop in a new Botan module.

svn path=/trunk/kdesupport/qca/; revision=609824
This commit is contained in:
Brad Hards 2006-12-02 11:49:26 +00:00
parent 58ce01231b
commit 5cbd52dbd3
2 changed files with 52 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
cmake/modules/FindBotan.cmake Normal file
View File

@ -0,0 +1,40 @@
# - Try to find the Gcrypt library
# Once run this will define
#
# BOTAN_FOUND - set if the system has the gcrypt library
# BOTAN_CFLAGS - the required gcrypt compilation flags
# BOTAN_LIBRARIES - the linker libraries needed to use the gcrypt library
#
# Copyright (c) 2006 Brad Hards <bradh@kde.org>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
# libgcrypt is moving to pkg-config, but earlier version don't have it
#search in typical paths for libgcrypt-config
FIND_PROGRAM(BOTANCONFIG_EXECUTABLE NAMES botan-config PATHS
/usr/bin
/usr/local/bin
)
#reset variables
set(BOTAN_LIBRARIES)
set(BOTAN_CFLAGS)
# if botan-config has been found
IF(BOTANCONFIG_EXECUTABLE)
EXEC_PROGRAM(${BOTANCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE BOTAN_LIBRARIES)
EXEC_PROGRAM(${BOTANCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE BOTAN_CFLAGS)
IF(BOTAN_LIBRARIES)
SET(BOTAN_FOUND TRUE)
message(STATUS "Found Botan: ${BOTAN_LIBRARIES}")
ENDIF(BOTAN_LIBRARIES)
MARK_AS_ADVANCED(BOTAN_CFLAGS BOTAN_LIBRARIES)
ENDIF(BOTANCONFIG_EXECUTABLE)

37
cmake/modules/FindNss.cmake
View File

@ -2,7 +2,7 @@
# Once done this will define
#
# NSS_FOUND - system has mozilla-nss lib
# NSS_INCLUDE_DIR - the mozilla-nss include directory
# NSS_INCLUDE_DIRS - the mozilla-nss include directories
# NSS_LIBRARIES - Link these to use mozilla-nss
# NSS_DEFINITIONS - Compiler switches required for using NSS
#
@ -11,37 +11,24 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
if (NSS_INCLUDE_DIR AND NSS_LIBRARIES)
if (NSS_INCLUDE_DIRS AND NSS_LIBRARIES)
# in cache already
SET(NSS_FOUND TRUE)
else (NSS_INCLUDE_DIR AND NSS_LIBRARIES)
else (NSS_INCLUDE_DIRS AND NSS_LIBRARIES)
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
INCLUDE(UsePkgConfig)
PKGCONFIG(mozilla-nss _NSSIncDir _NSSLinkDir _NSSLinkFlags _NSSCflags)
set(NSS_DEFINITIONS ${_NSSCflags})
FIND_PATH(NSS_INCLUDE_DIR nss/pk11func.h
${_NSSIncDir}
/usr/include
/usr/local/include
)
PKGCONFIG(nss _NSSIncDir _NSSLinkDir _NSSLinkFlags _NSSCflags)
set(NSS_DEFINITIONS ${_NSSCflags})
set(NSS_INCLUDE_DIRS ${_NSSIncDir})
set(NSS_LIBRARIES ${_NSSLinkFlags})
FIND_LIBRARY(NSS_LIBRARIES NAMES nss3
PATHS
${_NSSLinkDir}
/usr/lib
/usr/local/lib
)
if (NSS_INCLUDE_DIR AND NSS_LIBRARIES)
if (NSS_INCLUDE_DIRS AND NSS_LIBRARIES)
set(NSS_FOUND TRUE)
endif (NSS_INCLUDE_DIR AND NSS_LIBRARIES)
endif (NSS_INCLUDE_DIRS AND NSS_LIBRARIES)
if (NSS_FOUND)
if (NOT NSS_FIND_QUIETLY)
@ -53,6 +40,6 @@ else (NSS_INCLUDE_DIR AND NSS_LIBRARIES)
endif (NSS_FIND_REQUIRED)
endif (NSS_FOUND)
MARK_AS_ADVANCED(NSS_INCLUDE_DIR NSS_LIBRARIES)
MARK_AS_ADVANCED(NSS_INCLUDE_DIRS NSS_LIBRARIES)
endif (NSS_INCLUDE_DIR AND NSS_LIBRARIES)
endif (NSS_INCLUDE_DIRS AND NSS_LIBRARIES)