diff options
| author | Andrej Rode <mail@andrejro.de> | 2019-03-02 19:59:00 +0100 |
|---|---|---|
| committer | Marcus Müller <marcus.mueller@ettus.com> | 2019-03-04 22:30:37 +0100 |
| commit | ab2fb35677e38a384df3f9503d1f45f64bbc0374 (patch) | |
| tree | c59965a71d4951e9bcae9efcf9a6005df2f340a1 /gnuradio-runtime/lib/controlport | |
| parent | 4e777f1c0ee28011255e3b6b703463cef0f207e0 (diff) | |
cmake: Update to modern CMake usage
This includes using target based setting of includes
and link libraries. This will transitively add the includes
and linking flags to dependent targets.
This is still a work in progress since only the dynamic
libraries have been touched and not all of include_directories
directives are gone yet.
cmake: remove GR_INCLUDE_SUBDIRECTORY macro
Previously this macro was used to inject subdirectories in the
current CMake namespace. This is generally undesired and pollutes the
current context.
previously GNU Radio CMake had a non-default option ENABLE_STATIC_LIBS
to build both, shared libraries and static libraries.
This seems to be a construction taken over from autotools and serves
no purpuose in CMake and complicates the library building.
cmake: remove GR_LIBTOOL and la generation support
This looks like it was primarily used to support projects using
autotools, but comments state that the generated .la files aren't
compatible with autotools anyway.
cmake: Bump required CMake version to 3.8
UseSWIG cmake uses syntax which requires at least CMake 3.8 and is non-trivial
to change
Diffstat (limited to 'gnuradio-runtime/lib/controlport')
| -rw-r--r-- | gnuradio-runtime/lib/controlport/CMakeLists.txt | 104 |
1 files changed, 0 insertions, 104 deletions
diff --git a/gnuradio-runtime/lib/controlport/CMakeLists.txt b/gnuradio-runtime/lib/controlport/CMakeLists.txt deleted file mode 100644 index 0aa8539742..0000000000 --- a/gnuradio-runtime/lib/controlport/CMakeLists.txt +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 2013 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. - -if(ENABLE_GR_CTRLPORT) - -# Keep track of the number of backends ControlPort supports -SET(CTRLPORT_BACKENDS 0) - -# Add definition so we can compile in ControlPort to the blocks. -add_definitions(-DGR_CTRLPORT) - -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) - -list(APPEND gnuradio_ctrlport_sources - ${CMAKE_CURRENT_SOURCE_DIR}/rpcmanager.cc - ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_aggregator.cc - ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_booter_aggregator.cc - ${CMAKE_CURRENT_SOURCE_DIR}/rpcserver_selector.cc -) - - -OPTION(ENABLE_CTRLPORT_THRIFT "Enable ControlPort Thrift support" ON) - -if(ENABLE_CTRLPORT_THRIFT) - -# Look if Thrift is installed and use it as a ControlPort backend. -FIND_PACKAGE(Thrift) - -if(THRIFT_FOUND) - -include_directories(${THRIFT_INCLUDE_DIRS}) -MATH(EXPR CTRLPORT_BACKENDS "${CTRLPORT_BACKENDS} + 1") - -# Indicate thrift as an installed backend in the cmake summary. -message(STATUS "Found and enabling Thrift backend to ControlPort") -GR_APPEND_SUBCOMPONENT("thrift") - -# Run Thrift To compile C++ and Python files -message(STATUS "Running thrift to build C++ bindings") -file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/thrift/) - -list(APPEND gnuradio_thrift_generated_sources - ${CMAKE_CURRENT_BINARY_DIR}/thrift/gnuradio_types.cpp - ${CMAKE_CURRENT_BINARY_DIR}/thrift/gnuradio_constants.cpp - ${CMAKE_CURRENT_BINARY_DIR}/thrift/ControlPort.cpp - ) -add_custom_command( - DEPENDS ${CMAKE_SOURCE_DIR}/gnuradio-runtime/lib/controlport/thrift/gnuradio.thrift - OUTPUT ${gnuradio_thrift_generated_sources} - COMMAND ${THRIFT_BIN} --gen cpp -out ${CMAKE_CURRENT_BINARY_DIR}/thrift/ ${CMAKE_CURRENT_SOURCE_DIR}/thrift/gnuradio.thrift - ) -list(APPEND gnuradio_ctrlport_sources - ${CMAKE_CURRENT_SOURCE_DIR}/thrift/rpcserver_thrift.cc - ${CMAKE_CURRENT_SOURCE_DIR}/thrift/rpcpmtconverters_thrift.cc - ${CMAKE_CURRENT_SOURCE_DIR}/thrift/rpcserver_booter_thrift.cc - ${CMAKE_CURRENT_SOURCE_DIR}/thrift/thrift_application_base.cc - # add files built by compiling gnuradio.thrift - ${gnuradio_thrift_generated_sources} - ) - -# Add required libraries here -list(APPEND gnuradio_runtime_libs - ${THRIFT_LIBRARIES} -) - -# Add install rule to move example Thrift configuration file into -# $prefix/etc/gnuradio -install( - FILES ${CMAKE_CURRENT_SOURCE_DIR}/thrift/thrift.conf.example - DESTINATION ${SYSCONFDIR}/${CMAKE_PROJECT_NAME} -) - -endif(THRIFT_FOUND) -endif(ENABLE_CTRLPORT_THRIFT) - -######################################################################## -# Add controlport stuff to gnuradio-runtime -######################################################################## - -include_directories(${CMAKE_CURRENT_BINARY_DIR}) - -# Save the number of backends for testing against later -set( - CTRLPORT_BACKENDS ${CTRLPORT_BACKENDS} - CACHE INTERNAL "Number of ControlPort backends available" -) - -endif(ENABLE_GR_CTRLPORT) |