diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87c5362..2eab382 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,8 +72,7 @@ endif()
 ########################################################################
 # Install directories
 ########################################################################
-set(GR_REQUIRED_COMPONENTS RUNTIME PMT BLOCKS FILTER ANALOG)
-find_package(Gnuradio "3.8" REQUIRED)
+find_package(Gnuradio "3.8" REQUIRED COMPONENTS blocks analog filter fft)
 include(GrVersion)
 
 include(GrPlatform) #define LIB_SUFFIX
@@ -136,14 +135,17 @@ add_subdirectory(include/foo)
 add_subdirectory(lib)
 add_subdirectory(swig)
 add_subdirectory(python)
-if(ENABLE_GRC)
-    add_subdirectory(grc)
-endif(ENABLE_GRC)
+add_subdirectory(grc)
 
 ########################################################################
 # Install cmake search helper for this library
 ########################################################################
 
-install(FILES cmake/Modules/fooConfig.cmake
+configure_file(
+    ${CMAKE_SOURCE_DIR}/cmake/Modules/fooConfig.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/fooConfig.cmake
+@ONLY)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/fooConfig.cmake
     DESTINATION ${CMAKE_MODULES_DIR}/foo
 )
diff --git a/cmake/Modules/fooConfig.cmake b/cmake/Modules/fooConfig.cmake.in
similarity index 57%
rename from cmake/Modules/fooConfig.cmake
rename to cmake/Modules/fooConfig.cmake.in
index 4821286..1d348b7 100644
--- a/cmake/Modules/fooConfig.cmake
+++ b/cmake/Modules/fooConfig.cmake.in
@@ -6,9 +6,11 @@ FIND_PATH(
     NAMES foo/api.h
     HINTS $ENV{FOO_DIR}/include
         ${PC_FOO_INCLUDEDIR}
-    PATHS ${CMAKE_INSTALL_PREFIX}/include
-          /usr/local/include
-          /usr/include
+    PATHS
+        @CMAKE_INSTALL_PREFIX@/include
+        ${CMAKE_INSTALL_PREFIX}/include
+        /usr/local/include
+        /usr/include
 )
 
 FIND_LIBRARY(
@@ -16,13 +18,16 @@ FIND_LIBRARY(
     NAMES gnuradio-foo
     HINTS $ENV{FOO_DIR}/lib
         ${PC_FOO_LIBDIR}
-    PATHS ${CMAKE_INSTALL_PREFIX}/lib
-          ${CMAKE_INSTALL_PREFIX}/lib64
-          /usr/local/lib
-          /usr/local/lib64
-          /usr/lib
-          /usr/lib64
-          )
+    PATHS
+        @CMAKE_INSTALL_PREFIX@/lib
+        @CMAKE_INSTALL_PREFIX@/lib64
+        ${CMAKE_INSTALL_PREFIX}/lib
+        ${CMAKE_INSTALL_PREFIX}/lib64
+        /usr/local/lib
+        /usr/local/lib64
+        /usr/lib
+        /usr/lib64
+)
 
 include("${CMAKE_CURRENT_LIST_DIR}/fooTarget.cmake")
 
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index dc89daa..112e4a2 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -50,7 +50,13 @@ if(NOT foo_sources)
 endif(NOT foo_sources)
 
 add_library(gnuradio-foo SHARED ${foo_sources})
-target_link_libraries(gnuradio-foo gnuradio::gnuradio-runtime ${Boost_LIBRARIES} ${UHD_LIBRARIES})
+target_link_libraries(gnuradio-foo
+  gnuradio::gnuradio-runtime
+  gnuradio::gnuradio-pmt
+  gnuradio::gnuradio-blocks
+  gnuradio::gnuradio-filter
+  gnuradio::gnuradio-analog
+  ${UHD_LIBRARIES})
 target_include_directories(gnuradio-foo
     PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>
     PUBLIC $<INSTALL_INTERFACE:include>