From b440451fa83d7e6a2c881195255117f608699f79 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Tue, 14 Jan 2014 00:52:30 +0100 Subject: [PATCH] fix architecture dependend library paths --- cmake/Modules/FindLibconfig.cmake | 2 +- cmake/Modules/FindPolarSSL.cmake | 2 +- cmake/Modules/FindProtobufC.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/Modules/FindLibconfig.cmake b/cmake/Modules/FindLibconfig.cmake index 2f79e1e..ddc952c 100644 --- a/cmake/Modules/FindLibconfig.cmake +++ b/cmake/Modules/FindLibconfig.cmake @@ -3,7 +3,7 @@ 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" PATHS /usr/pkg /usr/local /usr PATH_SUFFIXES "lib") +find_path(LIBCONFIG_LIB_DIR NAMES "libconfig.so" "libconfig.dylib" PATHS /usr/pkg /usr/local /usr PATH_SUFFIXES "lib" "lib/${CMAKE_LIBRARY_ARCHITECTURE}") if(LIBCONFIG_INCLUDE_DIR AND LIBCONFIG_LIB_DIR) set(LIBCONFIG_LIBRARIES config) diff --git a/cmake/Modules/FindPolarSSL.cmake b/cmake/Modules/FindPolarSSL.cmake index 8697e50..a669b7e 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" PATHS /usr/pkg /usr/local /usr PATH_SUFFIXES "lib") +find_path(POLARSSL_LIB_DIR NAMES "libpolarssl.so" "libpolarssl.dylib" 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) diff --git a/cmake/Modules/FindProtobufC.cmake b/cmake/Modules/FindProtobufC.cmake index b21edc9..50bef29 100644 --- a/cmake/Modules/FindProtobufC.cmake +++ b/cmake/Modules/FindProtobufC.cmake @@ -1,7 +1,7 @@ include(FindPackageHandleStandardArgs) find_path(PROTOBUFC_INCLUDE_DIR NAMES "protobuf-c.h" PATHS /usr/pkg /usr/local /usr PATH_SUFFIXES "include/google/protobuf-c") -find_path(PROTOBUFC_LIB_DIR NAMES "libprotobuf-c.so" PATHS /usr/pkg /usr/local /usr PATH_SUFFIXES "lib") +find_path(PROTOBUFC_LIB_DIR NAMES "libprotobuf-c.so" "libprotobuf-c.dylib" PATHS /usr/pkg /usr/local /usr PATH_SUFFIXES "lib" "lib/${CMAKE_LIBRARY_ARCHITECTURE}") if(PROTOBUFC_INCLUDE_DIR AND PROTOBUFC_LIB_DIR) set(PROTOBUFC_LIBRARIES protobuf-c) -- 2.30.2