fixeria
/
srsRAN
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add /lib/x86... to CMake find library hints

This commit is contained in:
Xavier Arteaga 2019-09-16 09:34:17 +02:00 committed by Xavier Arteaga
parent db5a21e659
commit 3acfe68d35
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -207,6 +207,9 @@ if(ENABLE_SRSUE OR ENABLE_SRSENB OR ENABLE_SRSEPC)
if(UNIX AND EXISTS "/usr/lib64") if(UNIX AND EXISTS "/usr/lib64")
list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix
endif(UNIX AND EXISTS "/usr/lib64") 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 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.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" "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"

10
cmake/modules/FindLibConfig.cmake
View File

@ -14,31 +14,37 @@
FIND_PATH(LIBCONFIG_INCLUDE_DIR libconfig.h FIND_PATH(LIBCONFIG_INCLUDE_DIR libconfig.h
/usr/local/include /usr/local/include
/usr/include /usr/include
/usr/lib/x86_64-linux-gnu/
) )
FIND_PATH(LIBCONFIGPP_INCLUDE_DIR libconfig.h++ FIND_PATH(LIBCONFIGPP_INCLUDE_DIR libconfig.h++
/usr/local/include /usr/local/include
/usr/include /usr/include
/usr/lib/x86_64-linux-gnu/
) )
FIND_LIBRARY(LIBCONFIG_LIBRARY config FIND_LIBRARY(LIBCONFIG_LIBRARY config
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib
/usr/lib/x86_64-linux-gnu/
) )
FIND_LIBRARY(LIBCONFIGPP_LIBRARY config++ FIND_LIBRARY(LIBCONFIGPP_LIBRARY config++
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib
/usr/lib/x86_64-linux-gnu/
) )
FIND_LIBRARY(LIBCONFIG_STATIC_LIBRARY "libconfig${CMAKE_STATIC_LIBRARY_SUFFIX}" FIND_LIBRARY(LIBCONFIG_STATIC_LIBRARY "libconfig${CMAKE_STATIC_LIBRARY_SUFFIX}"
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib
/usr/lib/x86_64-linux-gnu/
) )
FIND_LIBRARY(LIBCONFIGPP_STATIC_LIBRARY "libconfig++${CMAKE_STATIC_LIBRARY_SUFFIX}" FIND_LIBRARY(LIBCONFIGPP_STATIC_LIBRARY "libconfig++${CMAKE_STATIC_LIBRARY_SUFFIX}"
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib
/usr/lib/x86_64-linux-gnu/
) )

1
cmake/modules/FindSCTP.cmake
View File

@ -28,6 +28,7 @@ FIND_LIBRARY(
/usr/local/lib64 /usr/local/lib64
/usr/lib /usr/lib
/usr/lib64 /usr/lib64
/usr/lib/x86_64-linux-gnu/
) )
message(STATUS "SCTP LIBRARIES: " ${SCTP_LIBRARIES}) message(STATUS "SCTP LIBRARIES: " ${SCTP_LIBRARIES})