summaryrefslogtreecommitdiff
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'next' into python3Johnathan Corgan2017-09-221-0/+69
|\
| * Merge branch 'master' into nextJohnathan Corgan2017-09-221-0/+69
| |\
| | * Merge branch 'maint'Johnathan Corgan2017-09-221-0/+69
| | |\
| | | * Merge remote-tracking branch 'github/pr/1447' into maintJohnathan Corgan2017-09-221-0/+69
| | | |\
| | | | * cmake: fix overloaded include_directories to work with CMake < 3.2.Michael Dickens2017-08-271-19/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "continue()" was introduced in CMake 3.2, which was released on March 11, 2015, which really wasn't that long ago. Remove use of this command to provide backward compatibility beyond 3.2.
| | | | * cmake: add CMake Overloads file and use it at the top levelMichael Dickens2017-08-271-0/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now, the CMakeOverloads file just overloads the CMake function "include_directories", to make it a little smarter. When parsing the provided directories, the overloaded macro now checks to see whether each directory is in the SOURCE or BUILD, or neither. If so, then the directory is added BEFORE others, and if not, then AFTER. The keywords BEFORE and AFTER are ignored. In this manner, all internal directories will come before external directories, which allows builds to work even if a prior version of GNU Radio is already installed into the CMAKE_INSTALL_PREFIX (e.g., as is often found when building from source, such as in MacPorts). By adding this macro at the top-level CMakeLists.txt file, it overloads all uses of "include_directories" in any subdirectory. As noted in the file: Moving all include directories to either BEFORE (internal to source or build) or AFTER (external to source or build) will work in general. The primary time it could fail is when include ordering is required to find a specific version of a header when multiple of the same name are available in the various include directories. This situation would be poor header naming practice, and is unlikely to occur in real life. As it does not occur in GNU Radio, so we ignore it.
| | | * | Merge remote-tracking branch 'github/pr/1424' into maintJohnathan Corgan2017-09-211-0/+7
| | | |\ \ | | | | |/ | | | |/|
| | | * | cmake: remove duplicate swig includesBastian Bloessl2017-07-132-3/+1
| | | | |
* | | | | Merge branch 'next' into python3Johnathan Corgan2017-09-211-0/+7
|\| | | |
| * | | | 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.
| | * | | 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.
| | | * | cmake: Fix for CppUnit and C++11Michael Dickens2017-08-141-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 '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
|\ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-22 10:54:44 +0000