[hamradio-commits] [gnss-sdr] 155/303: Find dependencies in more architectures
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Mon Feb 13 22:35:57 UTC 2017
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.
commit 4443e2f01cc3e6fa5e1ec19c1982f2898d131e87
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Sat Nov 5 13:40:44 2016 +0100
Find dependencies in more architectures
---
cmake/Modules/FindGFlags.cmake | 10 ++++++++++
cmake/Modules/FindGLOG.cmake | 41 +++++++++++++++++++++++++-------------
cmake/Modules/FindGnuradio.cmake | 28 +++++++++++++++++++++++---
cmake/Modules/FindGrOsmoSDR.cmake | 24 ++++++++++++++++++++++
cmake/Modules/FindLibOsmoSDR.cmake | 24 ++++++++++++++++++++++
cmake/Modules/FindUHD.cmake | 24 ++++++++++++++++++++++
cmake/Modules/FindVolk.cmake | 23 +++++++++++++++++++++
7 files changed, 157 insertions(+), 17 deletions(-)
diff --git a/cmake/Modules/FindGFlags.cmake b/cmake/Modules/FindGFlags.cmake
index 4a03a59..1aff218 100644
--- a/cmake/Modules/FindGFlags.cmake
+++ b/cmake/Modules/FindGFlags.cmake
@@ -42,8 +42,18 @@ else(APPLE)
/usr/lib/powerpc-linux-gnu
/usr/lib/powerpc64-linux-gnu
/usr/lib/powerpc64le-linux-gnu
+ /usr/lib/powerpc-linux-gnuspe
/usr/lib/hppa-linux-gnu
/usr/lib/s390x-linux-gnu
+ /usr/lib/i386-gnu
+ /usr/lib/hppa-linux-gnu
+ /usr/lib/x86_64-kfreebsd-gnu
+ /usr/lib/i386-kfreebsd-gnu
+ /usr/lib/m68k-linux-gnu
+ /usr/lib/sh4-linux-gnu
+ /usr/lib/sparc64-linux-gnu
+ /usr/lib/x86_64-linux-gnux32
+ /usr/lib/alpha-linux-gnu
/usr/lib64
/usr/lib
)
diff --git a/cmake/Modules/FindGLOG.cmake b/cmake/Modules/FindGLOG.cmake
index f99e3c6..68b012c 100644
--- a/cmake/Modules/FindGLOG.cmake
+++ b/cmake/Modules/FindGLOG.cmake
@@ -24,20 +24,33 @@ endif(MSVC)
macro(_FIND_GLOG_LIBRARIES _var)
find_library(${_var}
NAMES ${ARGN}
- PATHS ${LIB_PATHS} /opt/local/lib
- /usr/lib/x86_64-linux-gnu
- /usr/lib/i386-linux-gnu
- /usr/lib/arm-linux-gnueabihf
- /usr/lib/arm-linux-gnueabi
- /usr/lib/aarch64-linux-gnu
- /usr/lib/mipsel-linux-gnu
- /usr/lib/mips-linux-gnu
- /usr/lib/mips64el-linux-gnuabi64
- /usr/lib/powerpc-linux-gnu
- /usr/lib/powerpc64-linux-gnu
- /usr/lib/powerpc64le-linux-gnu
- /usr/lib/hppa-linux-gnu
- /usr/lib/s390x-linux-gnu
+ PATHS ${LIB_PATHS}
+ /usr/local/lib
+ /usr/lib/x86_64-linux-gnu
+ /usr/lib/i386-linux-gnu
+ /usr/lib/arm-linux-gnueabihf
+ /usr/lib/arm-linux-gnueabi
+ /usr/lib/aarch64-linux-gnu
+ /usr/lib/mipsel-linux-gnu
+ /usr/lib/mips-linux-gnu
+ /usr/lib/mips64el-linux-gnuabi64
+ /usr/lib/powerpc-linux-gnu
+ /usr/lib/powerpc64-linux-gnu
+ /usr/lib/powerpc64le-linux-gnu
+ /usr/lib/powerpc-linux-gnuspe
+ /usr/lib/hppa-linux-gnu
+ /usr/lib/s390x-linux-gnu
+ /usr/lib/i386-gnu
+ /usr/lib/hppa-linux-gnu
+ /usr/lib/x86_64-kfreebsd-gnu
+ /usr/lib/i386-kfreebsd-gnu
+ /usr/lib/m68k-linux-gnu
+ /usr/lib/sh4-linux-gnu
+ /usr/lib/sparc64-linux-gnu
+ /usr/lib/x86_64-linux-gnux32
+ /usr/lib/alpha-linux-gnu
+ /usr/lib64
+ /usr/lib
PATH_SUFFIXES lib
)
mark_as_advanced(${_var})
diff --git a/cmake/Modules/FindGnuradio.cmake b/cmake/Modules/FindGnuradio.cmake
index c89f2b3..f57da70 100644
--- a/cmake/Modules/FindGnuradio.cmake
+++ b/cmake/Modules/FindGnuradio.cmake
@@ -72,11 +72,33 @@ function(GR_MODULE EXTVAR PCNAME INCFILE LIBFILE)
${CMAKE_INSTALL_PREFIX}/lib/
${CMAKE_INSTALL_PREFIX}/lib64/
${GNURADIO_INSTALL_PREFIX}/lib/
- ${GNURADIO_INSTALL_PREFIX}/lib64
+ ${GNURADIO_INSTALL_PREFIX}/lib64
PATHS /usr/local/lib
- /usr/local/lib64
- /usr/lib
+ /usr/lib/x86_64-linux-gnu
+ /usr/lib/i386-linux-gnu
+ /usr/lib/arm-linux-gnueabihf
+ /usr/lib/arm-linux-gnueabi
+ /usr/lib/aarch64-linux-gnu
+ /usr/lib/mipsel-linux-gnu
+ /usr/lib/mips-linux-gnu
+ /usr/lib/mips64el-linux-gnuabi64
+ /usr/lib/powerpc-linux-gnu
+ /usr/lib/powerpc64-linux-gnu
+ /usr/lib/powerpc64le-linux-gnu
+ /usr/lib/powerpc-linux-gnuspe
+ /usr/lib/hppa-linux-gnu
+ /usr/lib/s390x-linux-gnu
+ /usr/lib/i386-gnu
+ /usr/lib/hppa-linux-gnu
+ /usr/lib/x86_64-kfreebsd-gnu
+ /usr/lib/i386-kfreebsd-gnu
+ /usr/lib/m68k-linux-gnu
+ /usr/lib/sh4-linux-gnu
+ /usr/lib/sparc64-linux-gnu
+ /usr/lib/x86_64-linux-gnux32
+ /usr/lib/alpha-linux-gnu
/usr/lib64
+ /usr/lib
${GNURADIO_INSTALL_PREFIX}/lib
)
list(APPEND ${LIBVAR_NAME} ${${LIBVAR_NAME}_${libname}})
diff --git a/cmake/Modules/FindGrOsmoSDR.cmake b/cmake/Modules/FindGrOsmoSDR.cmake
index ed0488f..a67e181 100644
--- a/cmake/Modules/FindGrOsmoSDR.cmake
+++ b/cmake/Modules/FindGrOsmoSDR.cmake
@@ -34,6 +34,30 @@ if(NOT GROSMOSDR_FOUND)
${GROSMOSDR_PKG_LIBRARY_DIRS}
/usr/lib
/usr/local/lib
+ /usr/lib/x86_64-linux-gnu
+ /usr/lib/i386-linux-gnu
+ /usr/lib/arm-linux-gnueabihf
+ /usr/lib/arm-linux-gnueabi
+ /usr/lib/aarch64-linux-gnu
+ /usr/lib/mipsel-linux-gnu
+ /usr/lib/mips-linux-gnu
+ /usr/lib/mips64el-linux-gnuabi64
+ /usr/lib/powerpc-linux-gnu
+ /usr/lib/powerpc64-linux-gnu
+ /usr/lib/powerpc64le-linux-gnu
+ /usr/lib/powerpc-linux-gnuspe
+ /usr/lib/hppa-linux-gnu
+ /usr/lib/s390x-linux-gnu
+ /usr/lib/i386-gnu
+ /usr/lib/hppa-linux-gnu
+ /usr/lib/x86_64-kfreebsd-gnu
+ /usr/lib/i386-kfreebsd-gnu
+ /usr/lib/m68k-linux-gnu
+ /usr/lib/sh4-linux-gnu
+ /usr/lib/sparc64-linux-gnu
+ /usr/lib/x86_64-linux-gnux32
+ /usr/lib/alpha-linux-gnu
+ /usr/lib64
)
if(GROSMOSDR_INCLUDE_DIR AND GROSMOSDR_LIBRARIES)
diff --git a/cmake/Modules/FindLibOsmoSDR.cmake b/cmake/Modules/FindLibOsmoSDR.cmake
index 3733b73..d024e06 100644
--- a/cmake/Modules/FindLibOsmoSDR.cmake
+++ b/cmake/Modules/FindLibOsmoSDR.cmake
@@ -26,6 +26,30 @@ if(NOT LIBOSMOSDR_FOUND)
${LIBOSMOSDR_PKG_LIBRARY_DIRS}
/usr/lib
/usr/local/lib
+ /usr/lib/x86_64-linux-gnu
+ /usr/lib/i386-linux-gnu
+ /usr/lib/arm-linux-gnueabihf
+ /usr/lib/arm-linux-gnueabi
+ /usr/lib/aarch64-linux-gnu
+ /usr/lib/mipsel-linux-gnu
+ /usr/lib/mips-linux-gnu
+ /usr/lib/mips64el-linux-gnuabi64
+ /usr/lib/powerpc-linux-gnu
+ /usr/lib/powerpc64-linux-gnu
+ /usr/lib/powerpc64le-linux-gnu
+ /usr/lib/powerpc-linux-gnuspe
+ /usr/lib/hppa-linux-gnu
+ /usr/lib/s390x-linux-gnu
+ /usr/lib/i386-gnu
+ /usr/lib/hppa-linux-gnu
+ /usr/lib/x86_64-kfreebsd-gnu
+ /usr/lib/i386-kfreebsd-gnu
+ /usr/lib/m68k-linux-gnu
+ /usr/lib/sh4-linux-gnu
+ /usr/lib/sparc64-linux-gnu
+ /usr/lib/x86_64-linux-gnux32
+ /usr/lib/alpha-linux-gnu
+ /usr/lib64
)
if(LIBOSMOSDR_INCLUDE_DIR AND LIBOSMOSDR_LIBRARIES)
diff --git a/cmake/Modules/FindUHD.cmake b/cmake/Modules/FindUHD.cmake
index d5a1271..3534e6b 100644
--- a/cmake/Modules/FindUHD.cmake
+++ b/cmake/Modules/FindUHD.cmake
@@ -21,6 +21,30 @@ FIND_LIBRARY(
HINTS $ENV{UHD_DIR}/lib
${PC_UHD_LIBDIR}
PATHS /usr/local/lib
+ /usr/lib/x86_64-linux-gnu
+ /usr/lib/i386-linux-gnu
+ /usr/lib/arm-linux-gnueabihf
+ /usr/lib/arm-linux-gnueabi
+ /usr/lib/aarch64-linux-gnu
+ /usr/lib/mipsel-linux-gnu
+ /usr/lib/mips-linux-gnu
+ /usr/lib/mips64el-linux-gnuabi64
+ /usr/lib/powerpc-linux-gnu
+ /usr/lib/powerpc64-linux-gnu
+ /usr/lib/powerpc64le-linux-gnu
+ /usr/lib/powerpc-linux-gnuspe
+ /usr/lib/hppa-linux-gnu
+ /usr/lib/s390x-linux-gnu
+ /usr/lib/i386-gnu
+ /usr/lib/hppa-linux-gnu
+ /usr/lib/x86_64-kfreebsd-gnu
+ /usr/lib/i386-kfreebsd-gnu
+ /usr/lib/m68k-linux-gnu
+ /usr/lib/sh4-linux-gnu
+ /usr/lib/sparc64-linux-gnu
+ /usr/lib/x86_64-linux-gnux32
+ /usr/lib/alpha-linux-gnu
+ /usr/lib64
/usr/lib
${GNURADIO_INSTALL_PREFIX}/lib
)
diff --git a/cmake/Modules/FindVolk.cmake b/cmake/Modules/FindVolk.cmake
index a9512fe..9621e16 100644
--- a/cmake/Modules/FindVolk.cmake
+++ b/cmake/Modules/FindVolk.cmake
@@ -23,6 +23,29 @@ FIND_LIBRARY(
PATHS /usr/local/lib
/usr/local/lib64
/usr/lib
+ /usr/lib/x86_64-linux-gnu
+ /usr/lib/i386-linux-gnu
+ /usr/lib/arm-linux-gnueabihf
+ /usr/lib/arm-linux-gnueabi
+ /usr/lib/aarch64-linux-gnu
+ /usr/lib/mipsel-linux-gnu
+ /usr/lib/mips-linux-gnu
+ /usr/lib/mips64el-linux-gnuabi64
+ /usr/lib/powerpc-linux-gnu
+ /usr/lib/powerpc64-linux-gnu
+ /usr/lib/powerpc64le-linux-gnu
+ /usr/lib/powerpc-linux-gnuspe
+ /usr/lib/hppa-linux-gnu
+ /usr/lib/s390x-linux-gnu
+ /usr/lib/i386-gnu
+ /usr/lib/hppa-linux-gnu
+ /usr/lib/x86_64-kfreebsd-gnu
+ /usr/lib/i386-kfreebsd-gnu
+ /usr/lib/m68k-linux-gnu
+ /usr/lib/sh4-linux-gnu
+ /usr/lib/sparc64-linux-gnu
+ /usr/lib/x86_64-linux-gnux32
+ /usr/lib/alpha-linux-gnu
/usr/lib64
${CMAKE_INSTALL_PREFIX}/lib
)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git
More information about the pkg-hamradio-commits
mailing list