diff --git a/CMakeLists.txt b/CMakeLists.txt index ae6f997f0..c6e9d04e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -207,6 +207,9 @@ if(ENABLE_SRSUE OR ENABLE_SRSENB OR ENABLE_SRSEPC) if(UNIX AND EXISTS "/usr/lib64") list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix endif(UNIX AND EXISTS "/usr/lib64") + if(UNIX AND EXISTS "/usr/lib/x86_64-linux-gnu/") + list(APPEND BOOST_LIBRARYDIR "/usr/lib/x86_64-linux-gnu/") + endif(UNIX AND EXISTS "/usr/lib/x86_64-linux-gnu/") set(Boost_ADDITIONAL_VERSIONS "1.35.0" "1.35" "1.36.0" "1.36" "1.37.0" "1.37" "1.38.0" "1.38" "1.39.0" "1.39" "1.40.0" "1.40" "1.41.0" "1.41" "1.42.0" "1.42" "1.43.0" "1.43" "1.44.0" "1.44" diff --git a/cmake/modules/FindLibConfig.cmake b/cmake/modules/FindLibConfig.cmake index 49bed9d26..51a908221 100644 --- a/cmake/modules/FindLibConfig.cmake +++ b/cmake/modules/FindLibConfig.cmake @@ -14,31 +14,37 @@ FIND_PATH(LIBCONFIG_INCLUDE_DIR libconfig.h /usr/local/include /usr/include + /usr/lib/x86_64-linux-gnu/ ) FIND_PATH(LIBCONFIGPP_INCLUDE_DIR libconfig.h++ /usr/local/include /usr/include + /usr/lib/x86_64-linux-gnu/ ) FIND_LIBRARY(LIBCONFIG_LIBRARY config /usr/local/lib /usr/lib + /usr/lib/x86_64-linux-gnu/ ) FIND_LIBRARY(LIBCONFIGPP_LIBRARY config++ /usr/local/lib /usr/lib + /usr/lib/x86_64-linux-gnu/ ) FIND_LIBRARY(LIBCONFIG_STATIC_LIBRARY "libconfig${CMAKE_STATIC_LIBRARY_SUFFIX}" /usr/local/lib /usr/lib + /usr/lib/x86_64-linux-gnu/ ) FIND_LIBRARY(LIBCONFIGPP_STATIC_LIBRARY "libconfig++${CMAKE_STATIC_LIBRARY_SUFFIX}" - /usr/local/lib - /usr/lib + /usr/local/lib + /usr/lib + /usr/lib/x86_64-linux-gnu/ ) diff --git a/cmake/modules/FindSCTP.cmake b/cmake/modules/FindSCTP.cmake index 1ce75edff..1c5ca66a5 100644 --- a/cmake/modules/FindSCTP.cmake +++ b/cmake/modules/FindSCTP.cmake @@ -28,6 +28,7 @@ FIND_LIBRARY( /usr/local/lib64 /usr/lib /usr/lib64 + /usr/lib/x86_64-linux-gnu/ ) message(STATUS "SCTP LIBRARIES: " ${SCTP_LIBRARIES})