--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -76,10 +76,9 @@
 	${AD9361_LIBRARIES}
 	${GNURADIO_ALL_LIBRARIES})
 set_target_properties(gnuradio-iio PROPERTIES
-	VERSION ${GR_IIO_VERSION}
-	SOVERSION ${GR_IIO_VERSION_MAJOR}
 	DEFINE_SYMBOL "gnuradio_iio_EXPORTS"
 )
+set_target_properties(gnuradio-iio PROPERTIES OUTPUT_NAME gnuradio-iio)
 
 if(APPLE)
     set_target_properties(gnuradio-iio PROPERTIES
@@ -90,11 +89,16 @@
 ########################################################################
 # Install built library files
 ########################################################################
-install(TARGETS gnuradio-iio
-	LIBRARY DESTINATION ${GR_LIBRARY_DIR} # .so/.dylib file
-	ARCHIVE DESTINATION ${GR_LIBRARY_DIR} # .lib file
-	RUNTIME DESTINATION ${GR_RUNTIME_DIR} # .dll file
-)
+include(GrMiscUtils)
+set(VERSION "1")
+set(LIBVER "1")
+GR_LIBRARY_FOO(gnuradio-iio)
+
+#install(TARGETS gnuradio-iio
+#	LIBRARY DESTINATION ${GR_LIBRARY_DIR} # .so/.dylib file
+#	ARCHIVE DESTINATION ${GR_LIBRARY_DIR} # .lib file
+#	RUNTIME DESTINATION ${GR_RUNTIME_DIR} # .dll file
+#)
 
 
 ########################################################################
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@
 ########################################################################
 # Project setup
 ########################################################################
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.8)
 project(gr-iio CXX C)
 
 set(GR_IIO_VERSION_MAJOR 0)
@@ -97,6 +97,9 @@
 # Install directories
 ########################################################################
 include(GrPlatform) #define LIB_SUFFIX
+if(NOT CMAKE_MODULES_DIR)
+  set(CMAKE_MODULES_DIR lib${LIB_SUFFIX}/cmake)
+endif(NOT CMAKE_MODULES_DIR)
 set(GR_RUNTIME_DIR      bin)
 if (NOT DEFINED GR_LIBRARY_DIR)
 	set(GR_LIBRARY_DIR      lib${LIB_SUFFIX})
@@ -111,6 +114,7 @@
 set(GR_LIBEXEC_DIR      libexec)
 set(GR_PKG_LIBEXEC_DIR  ${GR_LIBEXEC_DIR}/${CMAKE_PROJECT_NAME})
 set(GRC_BLOCKS_DIR      ${GR_PKG_DATA_DIR}/grc/blocks)
+set(GR_CMAKE_DIR        ${CMAKE_MODULES_DIR}/gnuradio-iio)
 
 ########################################################################
 # Find gnuradio build dependencies
@@ -121,8 +125,10 @@
 # components required to the list of GR_REQUIRED_COMPONENTS (in all
 # caps such as FILTER or FFT) and change the version to the minimum
 # API compatible version required.
-set(GR_REQUIRED_COMPONENTS RUNTIME ANALOG BLOCKS PMT VOLK)
-find_package(Gnuradio PATHS "c:/Program Files/gnuradio/lib/cmake/gnuradio" REQUIRED)
+#set(GR_REQUIRED_COMPONENTS RUNTIME ANALOG BLOCKS PMT VOLK)
+#find_package(Gnuradio PATHS "c:/Program Files/gnuradio/lib/cmake/gnuradio" REQUIRED)
+set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
+find_package(Gnuradio "3.8" REQUIRED)
 
 find_library(IIO_LIBRARIES iio)
 find_path(IIO_INCLUDE_DIRS iio.h)
@@ -196,6 +202,6 @@
 ########################################################################
 # Install cmake search helper for this library
 ########################################################################
-install(FILES cmake/Modules/iioConfig.cmake
-    DESTINATION lib/cmake/iio
-)
+#install(FILES cmake/Modules/gnuradio-iioConfig.cmake
+#    DESTINATION ${CMAKE_MODULES_DIR}/gnuradio-iio
+#)
--- /dev/null
+++ b/cmake/Modules/targetConfig.cmake.in
@@ -0,0 +1,26 @@
+# Copyright 2018 Free Software Foundation, Inc.
+#
+# 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.
+#
+# 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@")
+foreach(dep IN LISTS target_deps)
+    find_dependency(${dep})
+endforeach()
+include("${CMAKE_CURRENT_LIST_DIR}/@TARGET@Targets.cmake")
--- a/swig/CMakeLists.txt
+++ b/swig/CMakeLists.txt
@@ -29,7 +29,7 @@
 # Include swig generation macros
 ########################################################################
 find_package(SWIG)
-find_package(PythonLibs 2)
+find_package(PythonLibs)
 if(NOT SWIG_FOUND OR NOT PYTHONLIBS_FOUND)
     return()
 endif()
@@ -39,9 +39,8 @@
 ########################################################################
 # Setup swig generation
 ########################################################################
-foreach(incdir ${GNURADIO_RUNTIME_INCLUDE_DIRS})
-    list(APPEND GR_SWIG_INCLUDE_DIRS ${incdir}/gnuradio/swig)
-endforeach(incdir)
+set(GR_SWIG_INCLUDE_DIRS $<TARGET_PROPERTY:gnuradio::runtime_swig,INTERFACE_INCLUDE_DIRECTORIES>)
+set(GR_SWIG_TARGET_DEPS gnuradio::runtime_swig)
 
 set(GR_SWIG_LIBRARIES gnuradio-iio)
 GR_SWIG_MAKE(iio_swig iio_swig.i)
