[hamradio-commits] [gnss-sdr] 115/303: Improving cmake FindGrOsmoSDR module to support user-mode gnuradio installations
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Mon Feb 13 22:35:53 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 5812a66fbf7d0bd9057ea3d6f4aef69f815c72de
Author: Javier Arribas <javiarribas at gmail.com>
Date: Tue Oct 25 11:22:08 2016 +0200
Improving cmake FindGrOsmoSDR module to support user-mode gnuradio installations
---
cmake/Modules/FindGrOsmoSDR.cmake | 52 +++++++++++++++++++--------------------
1 file changed, 25 insertions(+), 27 deletions(-)
diff --git a/cmake/Modules/FindGrOsmoSDR.cmake b/cmake/Modules/FindGrOsmoSDR.cmake
index e39bd6b..ed0488f 100644
--- a/cmake/Modules/FindGrOsmoSDR.cmake
+++ b/cmake/Modules/FindGrOsmoSDR.cmake
@@ -17,35 +17,33 @@
# GROSMOSDR_LIBRARIES The gr-osmosdr libraries (gnuradio-osmosdr)
# GROSMOSDR_INCLUDE_DIR The location of gr-osmosdr headers
+if(NOT GROSMOSDR_FOUND)
+ pkg_check_modules (GROSMOSDR_PKG gnuradio-osmosdr)
+ find_path(GROSMOSDR_INCLUDE_DIR
+ NAMES osmosdr/source.h
+ osmosdr/api.h
+ PATHS
+ ${GROSMOSDR_PKG_INCLUDE_DIRS}
+ /usr/include
+ /usr/local/include
+ )
-
-FIND_PATH(GROSMOSDR_INCLUDE_DIR
- NAMES osmosdr/source.h
- osmosdr/api.h
- HINTS ${GrOsmoSDR_ROOT_DIR}/include
- PATHS /usr/local/include
- /usr/include
-)
-
-
-find_library(GROSMOSDR_LIBRARIES
- NAMES gnuradio-osmosdr
- HINTS ${GrOsmoSDR_ROOT_DIR}/lib
- PATHS /usr/local/lib
- /usr/lib
+ find_library(GROSMOSDR_LIBRARIES
+ NAMES gnuradio-osmosdr
+ PATHS
+ ${GROSMOSDR_PKG_LIBRARY_DIRS}
+ /usr/lib
+ /usr/local/lib
)
+ if(GROSMOSDR_INCLUDE_DIR AND GROSMOSDR_LIBRARIES)
+ set(GROSMOSDR_FOUND TRUE CACHE INTERNAL "gnuradio-osmosdr found")
+ message(STATUS "Found gnuradio-osmosdr: ${GROSMOSDR_INCLUDE_DIR}, ${GROSMOSDR_LIBRARIES}")
+ else(GROSMOSDR_INCLUDE_DIR AND GROSMOSDR_LIBRARIES)
+ set(GROSMOSDR_FOUND FALSE CACHE INTERNAL "gnuradio-osmosdr found")
+ message(STATUS "gnuradio-osmosdr not found.")
+ endif(GROSMOSDR_INCLUDE_DIR AND GROSMOSDR_LIBRARIES)
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(
- GrOsmoSDR
- DEFAULT_MSG
- GROSMOSDR_LIBRARIES
- GROSMOSDR_INCLUDE_DIR
-)
+mark_as_advanced(GROSMOSDR_INCLUDE_DIR GROSMOSDR_LIBRARIES)
-mark_as_advanced(
- GrOsmoSDR_ROOT_DIR
- GROSMOSDR_LIBRARIES
- GROSMOSDR_INCLUDE_DIR
-)
+endif(NOT GROSMOSDR_FOUND)
--
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