fix architecture dependend library paths

diff --git a/cmake/Modules/FindLibconfig.cmake b/cmake/Modules/FindLibconfig.cmake
index 2f79e1ec2462b283963b0c3e4e5349123f8d1cce..ddc952c403496c516dd15ebb3e038e720b3a5881 100644 (file)
--- 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 8697e5070150fb10f57ad38fed2a83f4f8803c41..a669b7e7bf6873bda1efbb281ce5e9d9855a7a97 100644 (file)
--- 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 b21edc94e0b8cd75beb474d85110edd4c820b5b6..50bef297f842590c6118f7372af0477d6998c5b6 100644 (file)
--- 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)