summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Expand)AuthorAgeFilesLines
...
| | * Merge remote-tracking branch 'josh/3710_win_fixes' into maintJohnathan Corgan2016-08-161-0/+3
| | |\
| | | * add srand/drand48() to msvc/config.hJosh Blum2016-08-061-0/+3
* | | | Merge branch 'next' into next-qt5Johnathan Corgan2016-08-0326-1355/+6
|\| | |
| * | | Merge remote-tracking branch 'github/nuke-cpack' into nextJohnathan Corgan2016-08-0326-1355/+6
| |\ \ \
| | * | | cmake: nuke cpack from existenceJohnathan Corgan2016-08-0326-1355/+6
* | | | | Merge branch 'next' into next-qt5Johnathan Corgan2016-08-031-43/+0
|\| | | |
| * | | | Merge remote-tracking branch 'github/require-logging' into nextJohnathan Corgan2016-08-031-43/+0
| |\ \ \ \
| | * | | | cmake: remove ENABLE_GR_LOG and require log4cppJohnathan Corgan2016-06-261-43/+0
* | | | | | Merge branch 'next' into next-qt5Johnathan Corgan2016-08-032-0/+119
|\| | | | |
| * | | | | Merge remote-tracking branch 'github/vocoder-unembed' into nextJohnathan Corgan2016-08-032-0/+119
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | gr-vocoder: gsm subcomponent using external gsm libraryA. Maitland Bottoms2016-06-251-0/+52
| | * | | | gr-vocoder: codec2 subcomponent using external codec2 libraryA. Maitland Bottoms2016-06-251-0/+67
| | |/ / /
* | | | | Merge branch 'next' into next-qt5Johnathan Corgan2016-08-011-7/+14
|\| | | |
| * | | | Merge branch 'master' into nextJohnathan Corgan2016-08-011-7/+14
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * / cmake: fix for when tree is git but git describe failsNicholas Corgan2016-08-011-7/+14
| | |/
| | * Merge branch 'maint'Johnathan Corgan2016-05-311-1/+7
| | |\
| | | * Revert "cmake: Fix warning related to GrSetupQt4 in modern CMake"Johnathan Corgan2016-05-311-1/+7
* | | | cmake: FindQwt: Find the Qwt library that matches the Qt versionPaul Cercueil2016-06-211-3/+9
* | | | Revert "CMake: Remove obsolete GrSetupQt4 module"Paul Cercueil2016-06-201-0/+150
* | | | Merge branch 'next' into next-qt5Johnathan Corgan2016-06-101-1/+0
|\| | |
| * | | pager: deprecated in 3.7, removed for 3.8Johnathan Corgan2016-06-101-1/+0
* | | | Merge branch 'next' into next-qt5Johnathan Corgan2016-06-061-2/+0
|\| | |
| * | | Merge branch 'remove-noaa' into nextJohnathan Corgan2016-06-061-1/+0
| |\ \ \
| | * | | noaa: remove for 3.8 releaseJohnathan Corgan2016-06-061-1/+0
| * | | | fcd: remove for 3.8 releaseJohnathan Corgan2016-06-061-1/+0
| |/ / /
* | | | Merge branch 'next' into 'next-qt5'Johnathan Corgan2016-05-304-3/+17
|\| | |
| * | | Merge branch 'master' into nextJohnathan Corgan2016-05-304-3/+17
| |\| |
| | * | Merge branch 'maint'Johnathan Corgan2016-05-304-3/+17
| | |\|
| | | * cmake: Windows-specific fixes for compatibilityPaul Cercueil2016-05-302-1/+13
| | | * MSVC-specific changes for compatibilitygnieboer2016-05-302-2/+4
* | | | Merge branch 'next' into next-qt5Johnathan Corgan2016-05-301-0/+4
|\| | |
| * | | Merge branch 'master' into nextJohnathan Corgan2016-05-301-0/+4
| |\| |
| | * | CMake: Fix search paths for the Volk submodule in GnuradioConfig.cmakePaul Cercueil2016-05-191-0/+2
| | * | CMake: Generate GnuradioConfig.cmake with a hardcoded install path hintPaul Cercueil2016-05-191-0/+2
* | | | Merge branch 'next' into next-qt5Johnathan Corgan2016-05-161-0/+1
|\| | |
| * | | Merge branch 'master' into nextJohnathan Corgan2016-05-161-0/+1
| |\| |
| | * | Merge branch 'maint'Johnathan Corgan2016-05-161-0/+1
| | |\|
| | | * CMake: GRBoost: gnuradio-runtime depends on boost::regexPaul Cercueil2016-05-161-0/+1
* | | | Merge branch 'next' into next-qt5Johnathan Corgan2016-03-091-2/+2
|\| | |
| * | | Merge branch 'master' into nextJohnathan Corgan2016-03-091-2/+2
| |\| |
| | * | Merge branch 'maint'Johnathan Corgan2016-03-091-2/+2
| | |\|
| | | * CMake: Fix dummy command in UseSWIG.cmakePaul Cercueil2016-03-091-2/+2
* | | | Merge branch 'next' into next-qt5Johnathan Corgan2016-02-211-1/+5
|\| | |
| * | | Merge branch 'master' into nextJohnathan Corgan2016-02-211-1/+5
| |\| |
| | * | Merge branch 'maint'Johnathan Corgan2016-02-211-1/+5
| | |\|
| | | * cmake: cmake should get native thrift binary when cross compiling.Tom Rondeau2016-02-161-1/+5
* | | | Merge branch 'next' into next-qt5Johnathan Corgan2016-02-211-1/+7
|\| | |
| * | | Merge branch 'master' into nextJohnathan Corgan2016-02-211-1/+7
| |\| |
| | * | cmake: when not release and no GIT_EXECUTABLE nad not .git directory in the a...Michael Dickens2016-02-171-1/+7
| | |/
* | | Merge branch 'next' into next-qt5Johnathan Corgan2016-02-101-2/+1
|\| |