cmake: Update FindCMokery.

This commit is contained in:
Andreas Schneider
2012-02-08 20:10:15 +01:00
parent f558c66e78
commit b7507fc85e
2 changed files with 44 additions and 45 deletions

View File

@@ -1,50 +1,51 @@
# - Try to find CMockery # - Try to find CMockery
# Once done this will define # Once done this will define
# #
# CMOCKERY_ROOT_DIR - Set this variable to the root installation of CMockery
#
# Read-Only variables:
# CMOCKERY_FOUND - system has CMockery # CMOCKERY_FOUND - system has CMockery
# CMOCKERY_INCLUDE_DIRS - the CMockery include directory # CMOCKERY_INCLUDE_DIR - the CMockery include directory
# CMOCKERY_LIBRARIES - Link these to use CMockery # CMOCKERY_LIBRARIES - Link these to use CMockery
# CMOCKERY_DEFINITIONS - Compiler switches required for using CMockery # CMOCKERY_DEFINITIONS - Compiler switches required for using CMockery
# #
# Copyright (c) 2010 Andreas Schneider <asn@cryptomilk.org> #=============================================================================
# Copyright (c) 2011-2012 Andreas Schneider <asn@cryptomilk.org>
# #
# Redistribution and use is allowed according to the terms of the New # Distributed under the OSI-approved BSD License (the "License");
# BSD license. # see accompanying file Copyright.txt for details.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file. #
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# #
set(_OPENSSL_ROOT_PATHS
"C:/OpenSSL/"
$ENV{PROGRAMFILES}/cmockery/include
)
if (CMOCKERY_LIBRARIES AND CMOCKERY_INCLUDE_DIRS) find_path(OPENSSL_ROOT_DIR
# in cache already NAMES
set(CMOCKERY_FOUND TRUE) include/google/cmockery.h
else (CMOCKERY_LIBRARIES AND CMOCKERY_INCLUDE_DIRS) PATHS
${_OPENSSL_ROOT_PATHS}
)
mark_as_advanced(OPENSSL_ROOT_DIR)
find_path(CMOCKERY_INCLUDE_DIR find_path(CMOCKERY_INCLUDE_DIR
NAMES NAMES
google/cmockery.h google/cmockery.h
PATHS PATHS
${_CMOCKERY_DIR}/include ${CMOCKERY_ROOT_DIR}/include
/usr/include
/usr/local/include
/opt/local/include
/sw/include
$ENV{PROGRAMFILES}/cmockery/include
) )
find_library(CMOCKERY_LIBRARY find_library(CMOCKERY_LIBRARY
NAMES NAMES
cmockery cmockery
PATHS PATHS
${_CMOCKERY_DIR}/lib ${CMOCKERY_ROOT_DIR}/include
/usr/lib
/usr/local/lib
/opt/local/lib
/sw/lib
$ENV{PROGRAMFILES}/cmockery/lib
)
set(CMOCKERY_INCLUDE_DIRS
${CMOCKERY_INCLUDE_DIR}
) )
if (CMOCKERY_LIBRARY) if (CMOCKERY_LIBRARY)
@@ -55,9 +56,7 @@ else (CMOCKERY_LIBRARIES AND CMOCKERY_INCLUDE_DIRS)
endif (CMOCKERY_LIBRARY) endif (CMOCKERY_LIBRARY)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(CMockery DEFAULT_MSG CMOCKERY_LIBRARIES CMOCKERY_INCLUDE_DIRS) find_package_handle_standard_args(CMockery DEFAULT_MSG CMOCKERY_LIBRARIES CMOCKERY_INCLUDE_DIR)
# show the CMOCKERY_INCLUDE_DIRS and CMOCKERY_LIBRARIES variables only in the advanced view # show the CMOCKERY_INCLUDE_DIR and CMOCKERY_LIBRARIES variables only in the advanced view
mark_as_advanced(CMOCKERY_INCLUDE_DIRS CMOCKERY_LIBRARIES) mark_as_advanced(CMOCKERY_INCLUDE_DIR CMOCKERY_LIBRARIES)
endif (CMOCKERY_LIBRARIES AND CMOCKERY_INCLUDE_DIRS)

View File

@@ -8,7 +8,7 @@ set(TORTURE_LIBRARY torture)
include_directories( include_directories(
${LIBSSH_PUBLIC_INCLUDE_DIRS} ${LIBSSH_PUBLIC_INCLUDE_DIRS}
${CMOCKERY_INCLUDE_DIRS} ${CMOCKERY_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIRS}
${GCRYPT_INCLUDE_DIRS} ${GCRYPT_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}