Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'next' into python3 | Johnathan Corgan | 2017-05-01 | 3 | -2/+229 |
|\ | |||||
| * | Merge branch 'master' into next | Johnathan Corgan | 2017-05-01 | 3 | -2/+229 |
| |\ | |||||
| | * | Merge branch 'maint' | Johnathan Corgan | 2017-05-01 | 3 | -2/+229 |
| | |\ | |||||
| | | * | cmake: add Coverage target and CMake module to generate coverage data | Andrej Rode | 2017-04-29 | 3 | -2/+229 |
| | | | | |||||
* | | | | Merge branch 'next' into python3 | Johnathan Corgan | 2017-04-23 | 1 | -3/+0 |
|\| | | | |||||
| * | | | docs: fix stray references to pager, fcd, and noaa | Johnathan Corgan | 2017-04-18 | 1 | -3/+0 |
| | | | | |||||
* | | | | Merge branch 'next' into python3 | Johnathan Corgan | 2017-04-17 | 1 | -1/+1 |
|\| | | | |||||
| * | | | Merge branch 'master' into next | Johnathan Corgan | 2017-04-17 | 1 | -1/+1 |
| |\| | | |||||
| | * | | runtime: turn off spurious SWIG warning about self | Johnathan Corgan | 2017-04-17 | 1 | -1/+1 |
| | | | | |||||
| | * | | docs: Add markdown styling to README | mhostetter | 2017-04-11 | 1 | -3/+3 |
| | | | | |||||
* | | | | Use GR_*_MIN_VERSION cmake variables from PR #1215 | Douglas Anderson | 2017-04-03 | 1 | -2/+2 |
| | | | | |||||
* | | | | modify GR_PYTHON_DIR code to handle prefix | Douglas Anderson | 2017-04-03 | 1 | -2/+6 |
| | | | | |||||
* | | | | Merge branch 'next' into python3 | Johnathan Corgan | 2017-03-26 | 1 | -3/+1 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt | ||||
| * | | | Merge branch 'min_deps_master' into min_deps_next | Martin Braun | 2017-03-26 | 1 | -3/+1 |
| |\| | | |||||
| | * | | cmake/docs: Move min versions into a single spot, put them all into vars | Martin Braun | 2017-03-26 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | | | | | - Autogen docs appropriately - Make it easier to maintain min versions | ||||
* | | | | Merge branch 'next' into python3 | Johnathan Corgan | 2017-03-22 | 2 | -4/+1 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: cmake/Modules/GrSwig.cmake | ||||
| * | | | Merge branch 'master' into next | Johnathan Corgan | 2017-03-22 | 2 | -3/+1 |
| |\| | | | | | | | | | | | | | | | | | | Conflicts: gr-wxgui/lib/CMakeLists.txt | ||||
| | * | | cmake: remove duplicate swig includes | Bastian Bloessl | 2017-03-22 | 2 | -3/+1 |
| | | | | |||||
* | | | | Merge branch 'next' into python3 | Johnathan Corgan | 2017-03-16 | 2 | -4/+4 |
|\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gr-blocks/swig/blocks_swig.py.in gr-uhd/apps/uhd_app.py | ||||
| * | | | Merge branch 'master' into next | Johnathan Corgan | 2017-03-15 | 1 | -2/+2 |
| |\| | | |||||
| | * | | Merge remote-tracking branch 'gnuradio-github/pr/1224' | Johnathan Corgan | 2017-03-15 | 1 | -2/+2 |
| | |\ \ | |||||
| | | * | | Bumped SWIG minimal SWIG version to 2.0.4 | Marcus Müller | 2017-03-10 | 1 | -2/+2 |
| | | |/ | |||||
| * | | | Merge branch 'master' into next | Johnathan Corgan | 2017-03-15 | 1 | -2/+2 |
| |\| | | |||||
| | * | | Modified add_custom_command to not try to execute "" | Marcus Müller | 2017-02-15 | 1 | -2/+2 |
| | |/ | | | | | | | | | | | | | | | | | | | former custom command called ""; this works fine on build systems were this is expanded by shell, but fails on some of my systems where add_custom_command's COMMAND parameter is directly executed (because there's no executable ""). | ||||
* | | | Merge branch 'gtk3' into python3 | Sebastian Koslowski | 2017-03-09 | 1 | -12/+92 |
|\ \ \ | |||||
| * | | | grc: gtk3: update cmake requirements | Sebastian Koslowski | 2017-01-23 | 1 | -11/+17 |
| | | | | |||||
| * | | | cmake: add DIRECTORY support to GR_PYTHON_INSTALL and use it for grc | Sebastian Koslowski | 2017-01-19 | 1 | -2/+76 |
| | | | | |||||
* | | | | python3: update non-GRC components to use python2 or python3 | Douglas Anderson | 2017-02-26 | 4 | -48/+33 |
| |/ / |/| | | |||||
* | | | Merge branch 'master' into next | Johnathan Corgan | 2017-02-12 | 5 | -615/+5 |
|\ \ \ | | |/ | |/| | |||||
| * | | cmake: removed stdint, inttypes, stdbool compat headers | Josh Blum | 2017-01-30 | 3 | -597/+0 |
| | | | | | | | | | | | | | | | These files are present in MSVC 2013 and up. Presumably we do not build with versions lower. | ||||
| * | | cmake: updates to msvc config.h | Josh Blum | 2017-01-30 | 2 | -18/+5 |
| | | | | | | | | | | | | | | | | | | | | | * Remove copies of math constants and add _USE_MATH_DEFINES to windows definitions. This should work for all MSVC versions * Version specific ifdef for the INFINITY macro (present in msvc 2013 and up) * Version specific ifdef for struct timespec (present in msvc 2015 and up) | ||||
* | | | Merge branch 'master' into next | Johnathan Corgan | 2017-01-26 | 1 | -1/+6 |
|\| | | |/ |/| | |||||
| * | Use -undefined dynamic_lookup linkage for python on macos | kolen | 2017-01-26 | 1 | -1/+6 |
| | | |||||
* | | Merge branch 'master' into next | Johnathan Corgan | 2016-12-13 | 1 | -2/+17 |
|\| | |||||
| * | cmake: atomic and chrono for BOOST_REQUIRED_COMPONENTS | Josh Blum | 2016-12-12 | 1 | -2/+17 |
| | | | | | | | | | | | | Conditional inclusion of atomic and chrono so that they will be linked under windows, but not bump the minimum boost for other platforms. | ||||
* | | Merge remote-tracking branch 'bastibl/cmake-qwt-fix' into next | Johnathan Corgan | 2016-11-11 | 1 | -1/+1 |
|\ \ | |||||
| * | | cmake: qwt prefere correct version | Bastian Bloessl | 2016-11-11 | 1 | -1/+1 |
| | | | |||||
* | | | Merge remote-tracking branch 'balister/fix-f24' into next | Johnathan Corgan | 2016-11-11 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | FindQwt.cmake: Add search path from Qwt5 on Fedora 24. | Philip Balister | 2016-11-10 | 1 | -0/+1 |
| |/ / | | | | | | | | | | Signed-off-by: Philip Balister <philip@balister.org> | ||||
* | | | Merge branch 'master' into next | Johnathan Corgan | 2016-11-11 | 2 | -10/+1 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Add config check for Xrand48() functions | Paul Cercueil | 2016-11-11 | 1 | -3/+0 |
| | | | | | | | | | | | | | | This fixes some compile errors under MinGW, which does not provide those functions. Signed-off-by: Paul Cercueil <paul.cercueil@analog.com> | ||||
| * | CMake: Fix math macros not available on MinGW | Paul Cercueil | 2016-11-11 | 1 | -1/+0 |
| | | | | | | | | Signed-off-by: Paul Cercueil <paul.cercueil@analog.com> | ||||
| * | CMake: GrBoost: Remove old workaround | Paul Cercueil | 2016-11-11 | 1 | -6/+1 |
| | | | | | | | | | | | | | | | | With recent versions of mingw-w64, or maybe with recent versions of Boost, the 'thread' component of Boost correctly points to the Win32 variant when building under MinGW. Signed-off-by: Paul Cercueil <paul.cercueil@analog.com> | ||||
* | | Merge branch 'master' into next | Johnathan Corgan | 2016-10-28 | 1 | -0/+8 |
|\| | | | | | | | | | | | | | Conflicts: gr-digital/swig/CMakeLists.txt gr-digital/swig/digital_swig.i gr-trellis/swig/CMakeLists.txt | ||||
| * | Use CMAKE_INSTALL_LIBDIR to set LIB_SUFFIX. | Philip Balister | 2016-10-25 | 1 | -0/+8 |
| | | | | | | | | | | | | | | OpenEmbedded sets this variable for builds, so use it to figure out if the build should install into the lib64 directories. Signed-off-by: Philip Balister <philip@balister.org> | ||||
* | | Revert "fixed the FindQwt to prefer pkgconfig for qt5-qwt" | Johnathan Corgan | 2016-09-20 | 1 | -10/+2 |
| | | | | | | | | This reverts commit 222fd4391a39873b5e114f3d30d47608a658b090. | ||||
* | | fixed the FindQwt to prefer pkgconfig for qt5-qwt | Marcus Müller | 2016-09-14 | 1 | -2/+10 |
| | | |||||
* | | wxgui: removed | Johnathan Corgan | 2016-09-08 | 2 | -3/+1 |
| | | |||||
* | | Merge branch 'next' into next-qt5 | Johnathan Corgan | 2016-08-16 | 1 | -0/+3 |
|\ \ | |||||
| * | | Merge branch 'master' into next | Johnathan Corgan | 2016-08-16 | 1 | -0/+3 |
| |\| |