From 7b00c47a71bae5bff93765a336bc13d682341b30 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 8 May 2017 11:05:15 +0200 Subject: [PATCH] Fixed cmake module files to search lib64 libraries (as suggested by Martin for OpenSUSE build) --- cmake/Modules/FindCM256.cmake | 2 ++ cmake/Modules/FindCM256cc.cmake | 2 ++ cmake/Modules/FindLibDSDcc.cmake | 4 +++- cmake/Modules/FindLimeSuite.cmake | 17 ++++++++++++++++- 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/cmake/Modules/FindCM256.cmake b/cmake/Modules/FindCM256.cmake index 4d38a8449..ef8cfcff3 100644 --- a/cmake/Modules/FindCM256.cmake +++ b/cmake/Modules/FindCM256.cmake @@ -19,7 +19,9 @@ FIND_LIBRARY(CM256_LIBRARIES PATHS ${CM256_INCLUDE_DIR}/../lib /usr/local/lib + /usr/local/lib64 /usr/lib + /usr/lib64 ) if(CM256_INCLUDE_DIR AND CM256_LIBRARIES) diff --git a/cmake/Modules/FindCM256cc.cmake b/cmake/Modules/FindCM256cc.cmake index ad1654dfd..c48ad51a4 100644 --- a/cmake/Modules/FindCM256cc.cmake +++ b/cmake/Modules/FindCM256cc.cmake @@ -19,7 +19,9 @@ FIND_LIBRARY(CM256CC_LIBRARIES PATHS ${CM256CC_INCLUDE_DIR}/../lib /usr/local/lib + /usr/local/lib64 /usr/lib + /usr/lib64 ) if(CM256CC_INCLUDE_DIR AND CM256CC_LIBRARIES) diff --git a/cmake/Modules/FindLibDSDcc.cmake b/cmake/Modules/FindLibDSDcc.cmake index ec28e2b0f..d733604f7 100644 --- a/cmake/Modules/FindLibDSDcc.cmake +++ b/cmake/Modules/FindLibDSDcc.cmake @@ -14,7 +14,9 @@ if(NOT LIBDSDCC_FOUND) PATHS ${LIBDSDCC_PKG_LIBRARY_DIRS} /usr/lib + /usr/lib64 /usr/local/lib + /usr/local/lib64 ) if(LIBDSDCC_INCLUDE_DIR AND LIBDSDCC_LIBRARIES) @@ -27,4 +29,4 @@ if(NOT LIBDSDCC_FOUND) mark_as_advanced(LIBDSDCC_INCLUDE_DIR LIBDSDCC_LIBRARIES) -endif(NOT LIBDSDCC_FOUND) \ No newline at end of file +endif(NOT LIBDSDCC_FOUND) diff --git a/cmake/Modules/FindLimeSuite.cmake b/cmake/Modules/FindLimeSuite.cmake index 0261656ce..02a7f5121 100644 --- a/cmake/Modules/FindLimeSuite.cmake +++ b/cmake/Modules/FindLimeSuite.cmake @@ -1,6 +1,21 @@ # Find Lime Suite -FIND_PATH(LIMESUITE_INCLUDE_DIR lime/LimeSuite.h) +FIND_PATH (LIMESUITE_INCLUDE_DIR + NAMES lime/LimeSuite.h + PATHS + /usr/include + /usr/local/include +) + +FIND_LIBRARY (LIMESUITE_LIBRARY + NAMES LimeSuite + HINTS ${CMAKE_INSTALL_PREFIX}/lib + ${CMAKE_INSTALL_PREFIX}/lib64 + PATHS /usr/local/lib + /usr/local/lib64 + /usr/lib + /usr/lib64 +) IF (LIMESUITE_INCLUDE_DIR AND LIMESUITE_LIBRARY) SET(LIMESUITE_FOUND TRUE)