diff options
| author | Tom Rondeau <tom@trondeau.com> | 2014-07-21 14:57:03 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2014-07-21 14:57:03 -0400 |
| commit | d09b971d01f4e65eff80065796d724d88168866d (patch) | |
| tree | 87520ad25d648a38238a8dbb9b7132dd18d95eb3 | |
| parent | 93db96faa81b260367908e977f15c0d7a45358db (diff) | |
| parent | 34bb146a85f2de8f9b491e303d35468d68bddaa3 (diff) | |
Merge branch 'maint'
| -rw-r--r-- | cmake/Modules/GnuradioConfig.cmake | 2 | ||||
| -rw-r--r-- | docs/doxygen/other/extra_pages.dox | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/cmake/Modules/GnuradioConfig.cmake b/cmake/Modules/GnuradioConfig.cmake index 55c70b374b..96f897830d 100644 --- a/cmake/Modules/GnuradioConfig.cmake +++ b/cmake/Modules/GnuradioConfig.cmake @@ -26,7 +26,7 @@ if(NOT GR_REQUIRED_COMPONENTS) endif() # Allows us to use all .cmake files in this directory -list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_CURRENT_LIST_DIR}) +list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_LIST_DIR}") # Easily access all libraries and includes of GNU Radio set(GNURADIO_ALL_LIBRARIES "") diff --git a/docs/doxygen/other/extra_pages.dox b/docs/doxygen/other/extra_pages.dox index 88aee72ffe..2a707f81aa 100644 --- a/docs/doxygen/other/extra_pages.dox +++ b/docs/doxygen/other/extra_pages.dox @@ -58,7 +58,7 @@ first. Most recent systems have these packages available. \subsection dep_gr_audio gr-audio: Audio Subsystems (system/OS dependent) \li audio-alsa (>= 0.9) http://www.alsa-project.org \li audio-jack (>= 0.8) http://jackaudio.org/ -\li portaduio (>= 19) http://www.portaudio.com/ +\li portaudio (>= 19) http://www.portaudio.com/ \li audio-oss (>= 1.0) http://www.opensound.com/oss.html \li audio-osx \li audio-windows @@ -318,5 +318,3 @@ volk_config file that sets all architectures to 'generic' as a way to test the vectorized versus non-vectorized implementations. */ - - |