diff options
| author |   Ron Economos <w6rz@comcast.net> | 2021-09-07 04:13:05 -0700 |
|---|---|---|
| committer |   Martin Braun <martin@gnuradio.org> | 2021-09-12 12:42:08 -0700 |
| commit | 9b096690ee2d4d13fa645f7c7e25775b04e41d04 (patch) | |
| tree | 96e418f787c1a7ccf46b0176dab193c03b5e9848 /gr-utils | |
| parent | network: tuntap knows what it's doing when it uses strncpy, suppress warning (diff) | |
| download | gnuradio-9b096690ee2d4d13fa645f7c7e25775b04e41d04.tar.xz gnuradio-9b096690ee2d4d13fa645f7c7e25775b04e41d04.zip | |
cmake: Use preferred method to find PkgConfig.
Signed-off-by: Ron Economos <w6rz@comcast.net>
Diffstat (limited to 'gr-utils')
| -rw-r--r-- | gr-utils/modtool/templates/gr-newmod/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gr-utils/modtool/templates/gr-newmod/cmake/Modules/howtoConfig.cmake | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/gr-utils/modtool/templates/gr-newmod/CMakeLists.txt b/gr-utils/modtool/templates/gr-newmod/CMakeLists.txt index ff56abfd1..c4d055460 100644 --- a/gr-utils/modtool/templates/gr-newmod/CMakeLists.txt +++ b/gr-utils/modtool/templates/gr-newmod/CMakeLists.txt @@ -73,7 +73,6 @@ ENDIF() ######################################################################## # Install directories ######################################################################## -include(FindPkgConfig) find_package(Gnuradio "3.9" REQUIRED) include(GrVersion) diff --git a/gr-utils/modtool/templates/gr-newmod/cmake/Modules/howtoConfig.cmake b/gr-utils/modtool/templates/gr-newmod/cmake/Modules/howtoConfig.cmake index a52621091..4f45052a9 100644 --- a/gr-utils/modtool/templates/gr-newmod/cmake/Modules/howtoConfig.cmake +++ b/gr-utils/modtool/templates/gr-newmod/cmake/Modules/howtoConfig.cmake @@ -1,6 +1,5 @@ -if(NOT PKG_CONFIG_FOUND) - INCLUDE(FindPkgConfig) -endif() +find_package(PkgConfig) + PKG_CHECK_MODULES(PC_HOWTO howto) FIND_PATH( |