summaryrefslogtreecommitdiff
path: root/cmake/Modules
Commit message (Collapse)AuthorAgeFilesLines
...
* cmake: qwt: Only allow qwt-qt5 as a library nameMartin Braun2018-11-151-1/+1
| | | | | | | | | | | | | The only way to be sure that FindQwt.cmake is finding the Qt5 version of Qwt is to either - limit the name to qwt-qt5 or - have the user specify it when running CMake. The latter is unimpeded by this change. However, by default, it'll now skip libqwt.so on Fedora and Ubuntu systems, which is actually only a valid library when using Qt4, not Qt5. Fixes #2027.
* cmake: Make FindQwt use pkg-configMartin Braun2018-11-131-0/+3
| | | | | | Note: This assumes the PC file is called Qt5Qwt6 for the Qt5 version of Qwt, which is true on F28. Ubuntu, as yet, does not ship a pkg-config file.
* cmake: Add Fedora 28 paths for Qwt/Qt5Martin Braun2018-11-131-0/+1
| | | | | Fedora installs Qwt headers into /usr/include/qt5/qwt, which was not listed as a hint, and finding Qwt would fail on that distro.
* Use raw strings for regexp and docstrings that have desired backslashesBrennan Ashton2018-11-121-2/+2
| | | | Resolves #2121 DeprecationWarning: invalid escape sequence /
* cmake: Fix coverage buildtype to use -lgcov for linkingAndrej Rode2018-11-092-27/+4
|
* Revert "cmake: fix finding Python packages' installation directory"Marcus Müller2018-11-011-6/+6
| | | | | | This reverts commit 0d6aa71a114a2d2c6be95bc59c45a621bf053c82. That commit broke the ability to use CMAKE_INSTALL_PREFIX.
* cmake: fix finding Python packages' installation directorykarel2018-11-011-6/+6
| | | | | | | Removes the hard-coded 'dist-packages' because it's Debian specific and leads to problems on distributions which use 'site-packages' (e.g. Arch and Gentoo). This commit still retains the current behavior in virtual environments without 'getsitepackages'.
* cmake: Remove old 'additional' Boost versions from GrBoost.cmakeMartin Braun2018-11-011-2/+1
|
* cmake: adhere to the new behaviour of CMP0026 policyAndrej Rode2018-10-282-10/+5
| | | | | | Previously the LOCATION property was used in several places through the tree. The Generator Syntax $<TARGET_FILE:tgt> has to be used now instead. This helps cmake figuring out the right file path.
* cmake: Remove superfluous code for old SWIGMartin Braun2018-10-121-31/+0
| | | | | | We had a hack for working around a bug in old SWIG, but old SWIG is no longer supported. We now require SWIG 3.0 and the bug only happened in pre-3.0.
* Merge remote-tracking branch 'origin/next' into merge_nextMarcus Müller2018-08-3113-1478/+261
|\
| * cmake: remove gengen toolsAndrej Rode2018-08-261-173/+0
| |
| * Merge branch 'python3_fix' into nextAndrej Rode2018-06-244-60/+129
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manual merge conflict resolution has been applied to following conflicts: * Typos: * gnuradio-runtime/python/gnuradio/ctrlport/GrDataPlotter.py * gr-blocks/python/blocks/qa_wavfile.py * gr-filter/examples/gr_filtdes_api.py * grc/blocks/parameter.xml * gr-uhd/python/uhd/__init__.py * ValueError -> RuntimeError: * gr-blocks/python/blocks/qa_hier_block2.py * relative Imports & other Py3k: * gr-digital/python/digital/psk_constellations.py * gr-digital/python/digital/qam_constellations.py * gr-digital/python/digital/test_soft_decisions.py * gr-digital/python/digital/gfsk.py * SequenceCompleter: * gr-utils/python/modtool/modtool_add.py * gr-utils/python/modtool/modtool_rename.py * gr-utils/python/modtool/modtool_rm.py * Updated API on next: * gr-blocks/grc/blocks_file_source.xml * gr-blocks/python/blocks/qa_file_source_sink.py * gr-qtgui/grc/qtgui_time_sink_x.xml * GRC Py3k Updates: * grc/core/Block.py * grc/core/Constants.py * grc/core/Platform.py * grc/core/utils/odict.py * grc/gui/Actions.py * grc/gui/Block.py * grc/gui/Executor.py * grc/gui/Port.py
| | * grc: hide ImportError for dep checks in cmakeSebastian Koslowski2017-11-081-0/+1
| | |
| | * Merge branch 'next' into python3Johnathan Corgan2017-09-221-0/+69
| | |\
| | * \ Merge branch 'next' into python3Johnathan Corgan2017-09-211-0/+7
| | |\ \
| | * \ \ Merge branch 'next' into python3Johnathan Corgan2017-05-013-2/+229
| | |\ \ \
| | * \ \ \ Merge branch 'next' into python3Johnathan Corgan2017-04-231-3/+0
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'next' into python3Johnathan Corgan2017-04-171-1/+1
| | |\ \ \ \ \
| | * | | | | | 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 'next' into python3Johnathan Corgan2017-03-222-4/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cmake/Modules/GrSwig.cmake
| | * \ \ \ \ \ \ \ 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 '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 nextMartin Braun2018-02-035-8/+8
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into nextJohnathan Corgan2017-09-221-0/+69
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | cmake: Fix for CppUnit and C++11Michael Dickens2017-08-161-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | If CppUnit version >= 1.14.0, try to switch to C++11. Otherwise, use C++98 as before. Requires that FindCppUnit return the CppUnit version if found.
| * | | | | | | | | | | Merge branch 'master' into nextJohnathan Corgan2017-05-013-2/+229
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | docs: fix stray references to pager, fcd, and noaaJohnathan Corgan2017-04-181-3/+0
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into nextJohnathan Corgan2017-04-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'min_deps_master' into min_deps_nextMartin Braun2017-03-261-3/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into nextJohnathan Corgan2017-03-222-3/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gr-wxgui/lib/CMakeLists.txt
| * | | | | | | | | | Merge branch 'master' into nextJohnathan Corgan2017-03-151-2/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into nextJohnathan Corgan2017-03-151-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into nextJohnathan Corgan2017-01-261-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into nextJohnathan Corgan2016-12-131-2/+17
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ 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-111-6/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | 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-036-1186/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: gr-qtgui/grc/CMakeLists.txt
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-25 21:29:58 +0000