mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
diff --git CMakeLists.txt CMakeLists.txt
|
|
index b8b5c23..f0c595c 100755
|
|
--- CMakeLists.txt
|
|
+++ CMakeLists.txt
|
|
@@ -87,14 +87,7 @@ ENDIF()
|
|
# Install directories
|
|
########################################################################
|
|
message(STATUS "Searching for GNU Radio installation ...")
|
|
-find_package(Gnuradio "3.8" QUIET)
|
|
-if(NOT GNURADIO_FOUND)
|
|
- message(STATUS "Searching for GNU Radio 3.9 ...")
|
|
- find_package(Gnuradio "3.9" REQUIRED blocks analog fft filter digital)
|
|
-else()
|
|
- message(STATUS "Searching for GNU Radio 3.8 ...")
|
|
- find_package(Gnuradio "3.8" REQUIRED blocks analog fft filter digital)
|
|
-endif()
|
|
+find_package(Gnuradio REQUIRED)
|
|
message(STATUS "Found GNU Radio ${Gnuradio_VERSION}")
|
|
|
|
include(GrVersion)
|
|
@@ -154,7 +147,7 @@ endif(DOXYGEN_FOUND)
|
|
########################################################################
|
|
add_subdirectory(pybind11)
|
|
# Probably the preferred way long term:
|
|
-# find_package(pybind11 REQUIRED)
|
|
+#find_package(pybind11 REQUIRED)
|
|
|
|
execute_process(
|
|
COMMAND "${PYTHON_EXECUTABLE}" -c
|
|
diff --git lib/CMakeLists.txt lib/CMakeLists.txt
|
|
index 539c100..a0374be 100755
|
|
--- lib/CMakeLists.txt
|
|
+++ lib/CMakeLists.txt
|
|
@@ -52,7 +52,7 @@ if(NOT gfdm_sources)
|
|
endif(NOT gfdm_sources)
|
|
|
|
add_library(gnuradio-gfdm SHARED ${gfdm_sources})
|
|
-target_link_libraries(gnuradio-gfdm gnuradio::gnuradio-runtime gnuradio-digital fftw3f::fftw3f)
|
|
+target_link_libraries(gnuradio-gfdm gnuradio::gnuradio-runtime gnuradio-digital gnuradio-filter gnuradio-fft fftw3f::fftw3f)
|
|
target_include_directories(gnuradio-gfdm
|
|
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
|
|
PUBLIC $<INSTALL_INTERFACE:include>
|