argilo
/
gr-osmosdr
forked from sdr/gr-osmosdr
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

cmake: use *_INCLUDE_DIRS in modules

This commit is contained in:
Dimitri Stolnikov 2013-08-13 20:10:51 +02:00
parent 9dfe3a6354
commit e97339c137
7 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/Modules/FindLibMiriSDR.cmake
View File

@ -1,6 +1,6 @@
if(NOT LIBMIRISDR_FOUND) if(NOT LIBMIRISDR_FOUND)
pkg_check_modules (LIBMIRISDR_PKG libmirisdr) pkg_check_modules (LIBMIRISDR_PKG libmirisdr)
find_path(LIBMIRISDR_INCLUDE_DIR NAMES mirisdr.h find_path(LIBMIRISDR_INCLUDE_DIRS NAMES mirisdr.h
PATHS PATHS
${LIBMIRISDR_PKG_INCLUDE_DIRS} ${LIBMIRISDR_PKG_INCLUDE_DIRS}
/usr/include /usr/include
@ -14,14 +14,14 @@ if(NOT LIBMIRISDR_FOUND)
/usr/local/lib /usr/local/lib
) )
if(LIBMIRISDR_INCLUDE_DIR AND LIBMIRISDR_LIBRARIES) if(LIBMIRISDR_INCLUDE_DIRS AND LIBMIRISDR_LIBRARIES)
set(LIBMIRISDR_FOUND TRUE CACHE INTERNAL "libmirisdr found") set(LIBMIRISDR_FOUND TRUE CACHE INTERNAL "libmirisdr found")
message(STATUS "Found libmirisdr: ${LIBMIRISDR_INCLUDE_DIR}, ${LIBMIRISDR_LIBRARIES}") message(STATUS "Found libmirisdr: ${LIBMIRISDR_INCLUDE_DIRS}, ${LIBMIRISDR_LIBRARIES}")
else(LIBMIRISDR_INCLUDE_DIR AND LIBMIRISDR_LIBRARIES) else(LIBMIRISDR_INCLUDE_DIRS AND LIBMIRISDR_LIBRARIES)
set(LIBMIRISDR_FOUND FALSE CACHE INTERNAL "libmirisdr found") set(LIBMIRISDR_FOUND FALSE CACHE INTERNAL "libmirisdr found")
message(STATUS "libmirisdr not found.") message(STATUS "libmirisdr not found.")
endif(LIBMIRISDR_INCLUDE_DIR AND LIBMIRISDR_LIBRARIES) endif(LIBMIRISDR_INCLUDE_DIRS AND LIBMIRISDR_LIBRARIES)
mark_as_advanced(LIBMIRISDR_INCLUDE_DIR LIBMIRISDR_LIBRARIES) mark_as_advanced(LIBMIRISDR_LIBRARIES LIBMIRISDR_INCLUDE_DIRS)
endif(NOT LIBMIRISDR_FOUND) endif(NOT LIBMIRISDR_FOUND)

12
cmake/Modules/FindLibOsmoSDR.cmake
View File

@ -1,6 +1,6 @@
if(NOT LIBOSMOSDR_FOUND) if(NOT LIBOSMOSDR_FOUND)
pkg_check_modules (LIBOSMOSDR_PKG libosmosdr) pkg_check_modules (LIBOSMOSDR_PKG libosmosdr)
find_path(LIBOSMOSDR_INCLUDE_DIR NAMES osmosdr.h find_path(LIBOSMOSDR_INCLUDE_DIRS NAMES osmosdr.h
PATHS PATHS
${LIBOSMOSDR_PKG_INCLUDE_DIRS} ${LIBOSMOSDR_PKG_INCLUDE_DIRS}
/usr/include /usr/include
@ -14,14 +14,14 @@ if(NOT LIBOSMOSDR_FOUND)
/usr/local/lib /usr/local/lib
) )
if(LIBOSMOSDR_INCLUDE_DIR AND LIBOSMOSDR_LIBRARIES) if(LIBOSMOSDR_INCLUDE_DIRS AND LIBOSMOSDR_LIBRARIES)
set(LIBOSMOSDR_FOUND TRUE CACHE INTERNAL "libosmosdr found") set(LIBOSMOSDR_FOUND TRUE CACHE INTERNAL "libosmosdr found")
message(STATUS "Found libosmosdr: ${LIBOSMOSDR_INCLUDE_DIR}, ${LIBOSMOSDR_LIBRARIES}") message(STATUS "Found libosmosdr: ${LIBOSMOSDR_INCLUDE_DIRS}, ${LIBOSMOSDR_LIBRARIES}")
else(LIBOSMOSDR_INCLUDE_DIR AND LIBOSMOSDR_LIBRARIES) else(LIBOSMOSDR_INCLUDE_DIRS AND LIBOSMOSDR_LIBRARIES)
set(LIBOSMOSDR_FOUND FALSE CACHE INTERNAL "libosmosdr found") set(LIBOSMOSDR_FOUND FALSE CACHE INTERNAL "libosmosdr found")
message(STATUS "libosmosdr not found.") message(STATUS "libosmosdr not found.")
endif(LIBOSMOSDR_INCLUDE_DIR AND LIBOSMOSDR_LIBRARIES) endif(LIBOSMOSDR_INCLUDE_DIRS AND LIBOSMOSDR_LIBRARIES)
mark_as_advanced(LIBOSMOSDR_INCLUDE_DIR LIBOSMOSDR_LIBRARIES) mark_as_advanced(LIBOSMOSDR_LIBRARIES LIBOSMOSDR_INCLUDE_DIRS)
endif(NOT LIBOSMOSDR_FOUND) endif(NOT LIBOSMOSDR_FOUND)

12
cmake/Modules/FindLibRTLSDR.cmake
View File

@ -1,6 +1,6 @@
if(NOT LIBRTLSDR_FOUND) if(NOT LIBRTLSDR_FOUND)
pkg_check_modules (LIBRTLSDR_PKG librtlsdr) pkg_check_modules (LIBRTLSDR_PKG librtlsdr)
find_path(LIBRTLSDR_INCLUDE_DIR NAMES rtl-sdr.h find_path(LIBRTLSDR_INCLUDE_DIRS NAMES rtl-sdr.h
PATHS PATHS
${LIBRTLSDR_PKG_INCLUDE_DIRS} ${LIBRTLSDR_PKG_INCLUDE_DIRS}
/usr/include /usr/include
@ -14,14 +14,14 @@ if(NOT LIBRTLSDR_FOUND)
/usr/local/lib /usr/local/lib
) )
if(LIBRTLSDR_INCLUDE_DIR AND LIBRTLSDR_LIBRARIES) if(LIBRTLSDR_INCLUDE_DIRS AND LIBRTLSDR_LIBRARIES)
set(LIBRTLSDR_FOUND TRUE CACHE INTERNAL "librtlsdr found") set(LIBRTLSDR_FOUND TRUE CACHE INTERNAL "librtlsdr found")
message(STATUS "Found librtlsdr: ${LIBRTLSDR_INCLUDE_DIR}, ${LIBRTLSDR_LIBRARIES}") message(STATUS "Found librtlsdr: ${LIBRTLSDR_INCLUDE_DIRS}, ${LIBRTLSDR_LIBRARIES}")
else(LIBRTLSDR_INCLUDE_DIR AND LIBRTLSDR_LIBRARIES) else(LIBRTLSDR_INCLUDE_DIRS AND LIBRTLSDR_LIBRARIES)
set(LIBRTLSDR_FOUND FALSE CACHE INTERNAL "librtlsdr found") set(LIBRTLSDR_FOUND FALSE CACHE INTERNAL "librtlsdr found")
message(STATUS "librtlsdr not found.") message(STATUS "librtlsdr not found.")
endif(LIBRTLSDR_INCLUDE_DIR AND LIBRTLSDR_LIBRARIES) endif(LIBRTLSDR_INCLUDE_DIRS AND LIBRTLSDR_LIBRARIES)
mark_as_advanced(LIBRTLSDR_INCLUDE_DIR LIBRTLSDR_LIBRARIES) mark_as_advanced(LIBRTLSDR_LIBRARIES LIBRTLSDR_INCLUDE_DIRS)
endif(NOT LIBRTLSDR_FOUND) endif(NOT LIBRTLSDR_FOUND)

12
cmake/Modules/FindLibbladeRF.cmake
View File

@ -1,6 +1,6 @@
if(NOT LIBBLADERF_FOUND) if(NOT LIBBLADERF_FOUND)
pkg_check_modules (LIBBLADERF_PKG libbladeRF) pkg_check_modules (LIBBLADERF_PKG libbladeRF)
find_path(LIBBLADERF_INCLUDE_DIR NAMES libbladeRF.h find_path(LIBBLADERF_INCLUDE_DIRS NAMES libbladeRF.h
PATHS PATHS
${LIBBLADERF_PKG_INCLUDE_DIRS} ${LIBBLADERF_PKG_INCLUDE_DIRS}
/usr/include /usr/include
@ -14,14 +14,14 @@ if(NOT LIBBLADERF_FOUND)
/usr/local/lib /usr/local/lib
) )
if(LIBBLADERF_INCLUDE_DIR AND LIBBLADERF_LIBRARIES) if(LIBBLADERF_INCLUDE_DIRS AND LIBBLADERF_LIBRARIES)
set(LIBBLADERF_FOUND TRUE CACHE INTERNAL "libbladeRF found") set(LIBBLADERF_FOUND TRUE CACHE INTERNAL "libbladeRF found")
message(STATUS "Found libbladeRF: ${LIBBLADERF_INCLUDE_DIR}, ${LIBBLADERF_LIBRARIES}") message(STATUS "Found libbladeRF: ${LIBBLADERF_INCLUDE_DIRS}, ${LIBBLADERF_LIBRARIES}")
else(LIBBLADERF_INCLUDE_DIR AND LIBBLADERF_LIBRARIES) else(LIBBLADERF_INCLUDE_DIRS AND LIBBLADERF_LIBRARIES)
set(LIBBLADERF_FOUND FALSE CACHE INTERNAL "libbladeRF found") set(LIBBLADERF_FOUND FALSE CACHE INTERNAL "libbladeRF found")
message(STATUS "libbladeRF not found.") message(STATUS "libbladeRF not found.")
endif(LIBBLADERF_INCLUDE_DIR AND LIBBLADERF_LIBRARIES) endif(LIBBLADERF_INCLUDE_DIRS AND LIBBLADERF_LIBRARIES)
mark_as_advanced(LIBBLADERF_INCLUDE_DIR LIBBLADERF_LIBRARIES) mark_as_advanced(LIBBLADERF_LIBRARIES LIBBLADERF_INCLUDE_DIRS)
endif(NOT LIBBLADERF_FOUND) endif(NOT LIBBLADERF_FOUND)

2
lib/miri/CMakeLists.txt
View File

@ -23,7 +23,7 @@
include_directories( include_directories(
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${LIBMIRISDR_INCLUDE_DIR} ${LIBMIRISDR_INCLUDE_DIRS}
) )
set(mirisdr_srcs set(mirisdr_srcs

2
lib/osmosdr/CMakeLists.txt
View File

@ -23,7 +23,7 @@
include_directories( include_directories(
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${LIBOSMOSDR_INCLUDE_DIR} ${LIBOSMOSDR_INCLUDE_DIRS}
) )
set(osmosdr_srcs set(osmosdr_srcs

2
lib/rtl/CMakeLists.txt
View File

@ -23,7 +23,7 @@
include_directories( include_directories(
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${LIBRTLSDR_INCLUDE_DIR} ${LIBRTLSDR_INCLUDE_DIRS}
) )
set(rtl_srcs set(rtl_srcs