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 /gr-uhd/examples/c++ | |
| 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 'gr-uhd/examples/c++')
| -rw-r--r-- | gr-uhd/examples/c++/CMakeLists.txt | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/gr-uhd/examples/c++/CMakeLists.txt b/gr-uhd/examples/c++/CMakeLists.txt index 66bf01c3e1..466642de1b 100644 --- a/gr-uhd/examples/c++/CMakeLists.txt +++ b/gr-uhd/examples/c++/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright 2011 Free Software Foundation, Inc. +# Copyright 2011,2019 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -18,24 +18,10 @@ # Boston, MA 02110-1301, USA. ######################################################################## -# Setup the include and linker paths -######################################################################## -include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${GR_UHD_INCLUDE_DIRS} - ${GNURADIO_RUNTIME_INCLUDE_DIRS} - ${Boost_INCLUDE_DIRS} - ${UHD_INCLUDE_DIRS} -) - -link_directories(${UHD_LIBRARY_DIRS}) -link_directories(${Boost_LIBRARY_DIRS}) - -######################################################################## # Build executable ######################################################################## add_executable(tags_demo tags_demo.cc) -target_link_libraries(tags_demo gnuradio-uhd ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(tags_demo gnuradio-uhd) INSTALL(TARGETS tags_demo |