From 545ebefb2440441f7b51e9a24333dee0df6caca3 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Thu, 16 Jan 2014 16:45:33 +0100 Subject: [PATCH] improved cmake modules --- cmake/Modules/FindLibconfig.cmake | 2 -- cmake/Modules/FindPolarSSL.cmake | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/cmake/Modules/FindLibconfig.cmake b/cmake/Modules/FindLibconfig.cmake index ddc952c..98b03c2 100644 --- a/cmake/Modules/FindLibconfig.cmake +++ b/cmake/Modules/FindLibconfig.cmake @@ -1,7 +1,5 @@ include(FindPackageHandleStandardArgs) -message("-- looking for libconfig") - find_path(LIBCONFIG_INCLUDE_DIR NAMES "libconfig.h" PATHS /usr/pkg /usr/local /usr PATH_SUFFIXES "include") find_path(LIBCONFIG_LIB_DIR NAMES "libconfig.so" "libconfig.dylib" PATHS /usr/pkg /usr/local /usr PATH_SUFFIXES "lib" "lib/${CMAKE_LIBRARY_ARCHITECTURE}") diff --git a/cmake/Modules/FindPolarSSL.cmake b/cmake/Modules/FindPolarSSL.cmake index a669b7e..26ad909 100644 --- a/cmake/Modules/FindPolarSSL.cmake +++ b/cmake/Modules/FindPolarSSL.cmake @@ -2,7 +2,7 @@ include(FindPackageHandleStandardArgs) include(CheckSymbolExists) find_path(POLARSSL_INCLUDE_DIR NAMES "version.h" PATHS /usr/pkg /usr/local /usr PATH_SUFFIXES "include/polarssl") -find_path(POLARSSL_LIB_DIR NAMES "libpolarssl.so" "libpolarssl.dylib" PATHS /usr/pkg /usr/local /usr PATH_SUFFIXES "lib" "lib/${CMAKE_LIBRARY_ARCHITECTURE}") +find_path(POLARSSL_LIB_DIR NAMES "libpolarssl.so" "libpolarssl.dylib" "libpolarssl.a" PATHS /usr/pkg /usr/local /usr PATH_SUFFIXES "lib" "lib/${CMAKE_LIBRARY_ARCHITECTURE}") if(POLARSSL_INCLUDE_DIR AND POLARSSL_LIB_DIR) set(POLARSSL_LIBRARIES polarssl) -- 2.30.2