summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'next' into python3Johnathan Corgan2017-05-013-2/+229
|\
| * Merge branch 'master' into nextJohnathan Corgan2017-05-013-2/+229
| |\
| | * Merge branch 'maint'Johnathan Corgan2017-05-013-2/+229
| | |\
| | | * cmake: add Coverage target and CMake module to generate coverage dataAndrej Rode2017-04-293-2/+229
| | | |
* | | | Merge branch 'next' into python3Johnathan Corgan2017-04-231-3/+0
|\| | |
| * | | docs: fix stray references to pager, fcd, and noaaJohnathan Corgan2017-04-181-3/+0
| | | |
* | | | Merge branch 'next' into python3Johnathan Corgan2017-04-171-1/+1
|\| | |
| * | | Merge branch 'master' into nextJohnathan Corgan2017-04-171-1/+1
| |\| |
| | * | runtime: turn off spurious SWIG warning about selfJohnathan Corgan2017-04-171-1/+1
| | | |
| | * | docs: Add markdown styling to READMEmhostetter2017-04-111-3/+3
| | | |
* | | | Use GR_*_MIN_VERSION cmake variables from PR #1215Douglas Anderson2017-04-031-2/+2
| | | |
* | | | modify GR_PYTHON_DIR code to handle prefixDouglas Anderson2017-04-031-2/+6
| | | |
* | | | Merge branch 'next' into python3Johnathan Corgan2017-03-261-3/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: CMakeLists.txt
| * | | Merge branch 'min_deps_master' into min_deps_nextMartin Braun2017-03-261-3/+1
| |\| |
| | * | cmake/docs: Move min versions into a single spot, put them all into varsMartin Braun2017-03-261-3/+1
| | | | | | | | | | | | | | | | | | | | - Autogen docs appropriately - Make it easier to maintain min versions
* | | | Merge branch 'next' into python3Johnathan Corgan2017-03-222-4/+1
|\| | | | | | | | | | | | | | | | | | | Conflicts: cmake/Modules/GrSwig.cmake
| * | | Merge branch 'master' into nextJohnathan Corgan2017-03-222-3/+1
| |\| | | | | | | | | | | | | | | | | | Conflicts: gr-wxgui/lib/CMakeLists.txt
| | * | cmake: remove duplicate swig includesBastian Bloessl2017-03-222-3/+1
| | | |
* | | | Merge branch 'next' into python3Johnathan Corgan2017-03-162-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: gr-blocks/swig/blocks_swig.py.in gr-uhd/apps/uhd_app.py
| * | | Merge branch 'master' into nextJohnathan Corgan2017-03-151-2/+2
| |\| |
| | * | Merge remote-tracking branch 'gnuradio-github/pr/1224'Johnathan Corgan2017-03-151-2/+2
| | |\ \
| | | * | Bumped SWIG minimal SWIG version to 2.0.4Marcus Müller2017-03-101-2/+2
| | | |/
| * | | Merge branch 'master' into nextJohnathan Corgan2017-03-151-2/+2
| |\| |
| | * | Modified add_custom_command to not try to execute ""Marcus Müller2017-02-151-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 python3Sebastian Koslowski2017-03-091-12/+92
|\ \ \
| * | | grc: gtk3: update cmake requirementsSebastian Koslowski2017-01-231-11/+17
| | | |
| * | | cmake: add DIRECTORY support to GR_PYTHON_INSTALL and use it for grcSebastian Koslowski2017-01-191-2/+76
| | | |
* | | | python3: update non-GRC components to use python2 or python3Douglas Anderson2017-02-264-48/+33
| |/ / |/| |
* | | Merge branch 'master' into nextJohnathan Corgan2017-02-125-615/+5
|\ \ \ | | |/ | |/|
| * | cmake: removed stdint, inttypes, stdbool compat headersJosh Blum2017-01-303-597/+0
| | | | | | | | | | | | | | | These files are present in MSVC 2013 and up. Presumably we do not build with versions lower.
| * | cmake: updates to msvc config.hJosh Blum2017-01-302-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 nextJohnathan Corgan2017-01-261-1/+6
|\| | | |/ |/|
| * Use -undefined dynamic_lookup linkage for python on macoskolen2017-01-261-1/+6
| |
* | Merge branch 'master' into nextJohnathan Corgan2016-12-131-2/+17
|\|
| * cmake: atomic and chrono for BOOST_REQUIRED_COMPONENTSJosh Blum2016-12-121-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 nextJohnathan Corgan2016-11-111-1/+1
|\ \
| * | cmake: qwt prefere correct versionBastian Bloessl2016-11-111-1/+1
| | |
* | | Merge remote-tracking branch 'balister/fix-f24' into nextJohnathan Corgan2016-11-111-0/+1
|\ \ \
| * | | FindQwt.cmake: Add search path from Qwt5 on Fedora 24.Philip Balister2016-11-101-0/+1
| |/ / | | | | | | | | | Signed-off-by: Philip Balister <philip@balister.org>
* | | Merge branch 'master' into nextJohnathan Corgan2016-11-112-10/+1
|\ \ \ | |/ / |/| / | |/
| * Add config check for Xrand48() functionsPaul Cercueil2016-11-111-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 MinGWPaul Cercueil2016-11-111-1/+0
| | | | | | | | Signed-off-by: Paul Cercueil <paul.cercueil@analog.com>
| * CMake: GrBoost: Remove old workaroundPaul Cercueil2016-11-111-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 nextJohnathan Corgan2016-10-281-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 Balister2016-10-251-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 Corgan2016-09-201-10/+2
| | | | | | | | This reverts commit 222fd4391a39873b5e114f3d30d47608a658b090.
* | fixed the FindQwt to prefer pkgconfig for qt5-qwtMarcus Müller2016-09-141-2/+10
| |
* | wxgui: removedJohnathan Corgan2016-09-082-3/+1
| |
* | Merge branch 'next' into next-qt5Johnathan Corgan2016-08-161-0/+3
|\ \
| * | Merge branch 'master' into nextJohnathan Corgan2016-08-161-0/+3
| |\|