diff options
| author | Johnathan Corgan | 2012-08-28 12:15:55 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2012-08-28 12:15:55 -0700 |
| commit | ef6648763589d389c0e95d62f524e46b32dd597c (patch) | |
| tree | d1d6322c9d82c1f0d3fa753d82414add3805bb11 | |
| parent | 9305abf4be93205cf240e99ce7136702f724c490 (diff) | |
| parent | 31e992a2850450121199169f8538f28b2f634cd7 (diff) | |
| download | gnuradio-ef6648763589d389c0e95d62f524e46b32dd597c.tar.gz gnuradio-ef6648763589d389c0e95d62f524e46b32dd597c.tar.bz2 gnuradio-ef6648763589d389c0e95d62f524e46b32dd597c.zip | |
Merge branch 'maint'
| -rw-r--r-- | gr-fcd/doc/README.fcd | 2 | ||||
| -rw-r--r-- | gr-fcd/doc/fcd.dox | 2 | ||||
| -rw-r--r-- | volk/lib/CMakeLists.txt | 13 |
3 files changed, 15 insertions, 2 deletions
diff --git a/gr-fcd/doc/README.fcd b/gr-fcd/doc/README.fcd index 83b4da1ce..c6ee02fff 100644 --- a/gr-fcd/doc/README.fcd +++ b/gr-fcd/doc/README.fcd @@ -1,7 +1,7 @@ This is the gr-fcd package. It contains a source block for the FunCube Dongle hardware. -The Python namespace is in gnuradio.qtgui, which would be normally +The Python namespace is in gnuradio.fcd, which would be normally imported as: from gnuradio import fcd diff --git a/gr-fcd/doc/fcd.dox b/gr-fcd/doc/fcd.dox index 6e07c585b..aca4dadaa 100644 --- a/gr-fcd/doc/fcd.dox +++ b/gr-fcd/doc/fcd.dox @@ -5,7 +5,7 @@ This is the gr-fcd package. It contains a source block for the FunCube Dongle hardware. -The Python namespace is in gnuradio.qtgui, which would be normally +The Python namespace is in gnuradio.fcd, which would be normally imported as: \code diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt index 59d78b446..58bf026b4 100644 --- a/volk/lib/CMakeLists.txt +++ b/volk/lib/CMakeLists.txt @@ -55,6 +55,17 @@ if(NOT DEFINED COMPILER_NAME) endif() ######################################################################## +# Special clang flag so flag checks can fail +######################################################################## +if(COMPILER_NAME MATCHES "GNU") + include(CheckCXXCompilerFlag) + CHECK_CXX_COMPILER_FLAG("-Werror=unused-command-line-argument" HAVE_WERROR_UNUSED_CMD_LINE_ARG) + if(HAVE_WERROR_UNUSED_CMD_LINE_ARG) + set(VOLK_FLAG_CHECK_FLAGS "-Werror=unused-command-line-argument") + endif() +endif() + +######################################################################## # detect x86 flavor of CPU ######################################################################## if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "^(i.86|x86|x86_64|amd64)$") @@ -82,7 +93,9 @@ macro(check_arch arch_name) COMMAND ${PYTHON_EXECUTABLE} -c "import re; print(re.sub('\\W', '_', '${have_flag}'))" OUTPUT_VARIABLE have_flag OUTPUT_STRIP_TRAILING_WHITESPACE ) + set(CMAKE_REQUIRED_FLAGS VOLK_FLAG_CHECK_FLAGS) CHECK_CXX_COMPILER_FLAG(${flag} ${have_flag}) + unset(CMAKE_REQUIRED_FLAGS) if (NOT ${have_flag}) set(have_${arch_name} FALSE) endif() |