From 8ff210a5195a1371dbe89f5b865979ea8e772977 Mon Sep 17 00:00:00 2001 From: Mario Haustein Date: Fri, 8 May 2026 23:39:47 +0200 Subject: [PATCH] cmake: use GR_INSTALL_LIBRARY to install modules --- cmake/Modules/targetConfig.cmake.in | 18 +++--------------- lib/CMakeLists.txt | 5 ++++- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/cmake/Modules/targetConfig.cmake.in b/cmake/Modules/targetConfig.cmake.in index 79e4a28..960e9c0 100644 --- a/cmake/Modules/targetConfig.cmake.in +++ b/cmake/Modules/targetConfig.cmake.in @@ -2,25 +2,13 @@ # # 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. +# SPDX-License-Identifier: GPL-3.0-or-later # -# 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. include(CMakeFindDependencyMacro) -set(target_deps "@TARGET_DEPENDENCIES@") +set(target_deps "@GR_LIB_EXPORT_DEPS@") foreach(dep IN LISTS target_deps) find_dependency(${dep}) endforeach() -include("${CMAKE_CURRENT_LIST_DIR}/@TARGET@Targets.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/@GR_LIB_TARGET@Targets.cmake") diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 8673038..4001411 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -291,4 +291,7 @@ target_link_libraries(gnuradio-osmosdr ${gr_osmosdr_libs}) # Install built library files ######################################################################## include(GrMiscUtils) -GR_LIBRARY_FOO(gnuradio-osmosdr) +GR_INSTALL_LIBRARY( + TARGET gnuradio-osmosdr + COMPONENT gnuradio-osmosdr +) -- 2.53.0