FGFS-4.1/gr-air-modes
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into qtapp

Browse Source 
Conflicts:
	CMakeLists.txt
	lib/air_modes_preamble.cc
	python/sql.py
This commit is contained in:
Johnathan Corgan
2012-10-07 17:54:03 -07:00
parent 89d818a792 4866987ff1
commit f18d111e1c
9 changed files with 56 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/Modules/FindGnuradioCore.cmake
+2 -2
View File
@@ -1,11 +1,11 @@
INCLUDE(FindPkgConfig)
PKG_CHECK_MODULES(PC_GNURADIO_CORE gnuradio-core QUIET)
PKG_CHECK_MODULES(PC_GNURADIO_CORE gnuradio-core)
FIND_PATH(
GNURADIO_CORE_INCLUDE_DIRS
NAMES gr_random.h
HINTS $ENV{GNURADIO_CORE_DIR}/include/gnuradio
${PC_GNURADIO_CORE_INCLUDE_DIR}
${PC_GNURADIO_CORE_INCLUDEDIR}
PATHS /usr/local/include/gnuradio
/usr/include/gnuradio
)
cmake/Modules/FindGruel.cmake
+2 -2
View File
@@ -1,11 +1,11 @@
INCLUDE(FindPkgConfig)
PKG_CHECK_MODULES(PC_GRUEL gnuradio-core QUIET)
PKG_CHECK_MODULES(PC_GRUEL gnuradio-core)
FIND_PATH(
GRUEL_INCLUDE_DIRS
NAMES gruel/attributes.h
HINTS $ENV{GRUEL_DIR}/include
${PC_GRUEL_INCLUDE_DIR}
${PC_GRUEL_INCLUDEDIR}
PATHS /usr/local/include
/usr/include
)