diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 2.8.12)
 project(kmplayer)
 
-cmake_policy(VERSION 2.6)
-
 SET(KMPLAYER_MAJOR_VERSION "0")
 SET(KMPLAYER_MINOR_VERSION "12")
 SET(KMPLAYER_PATCH_VERSION "0b")
@@ -41,29 +39,29 @@
   OPTION(KMPLAYER_BUILT_WITH_CAIRO "Enable Cairo support" ON)
   OPTION(KMPLAYER_BUILT_WITH_NPP "Build NPP player" ON)
   OPTION(KMPLAYER_BUILT_WITH_EXPAT "Use expat XML parser" OFF)
-  INCLUDE(UsePkgConfig)
+  include(FindPkgConfig)
 
   if (KMPLAYER_BUILT_WITH_CAIRO)
 
-    PKGCONFIG(cairo CAIROIncDir CAIROLinkDir CAIROLinkFlags CAIROCflags)
+    pkg_check_modules(CAIRO cairo)
 
-    if (CAIROCflags)
+    if(CAIRO_FOUND)
         set(KMPLAYER_WITH_CAIRO 1)
-    endif (CAIROCflags)
+    endif()
   endif (KMPLAYER_BUILT_WITH_CAIRO)
 
   if (KMPLAYER_BUILT_WITH_NPP)
-    PKGCONFIG(dbus-glib-1 GLibDBusIncDir GLibDBusLinkDir GLibDBusLinkFlags GLibDBusCflags)
-    PKGCONFIG(gmodule-2.0 GModuleIncDir GModuleLinkDir GModuleLinkFlags GModuleCflags)
+    pkg_check_modules(GLibDBus dbus-glib-1)
+    pkg_check_modules(GModule gmodule-2.0)
 
-    if (GLibDBusCflags)
+    if(GLibDBus_FOUND)
       set(KMPLAYER_WITH_GDBUS 1)
-      PKGCONFIG(gtk+-x11-2.0 GTKIncDir GTKLinkDir GTKLinkFlags GTKCflags)
-      PKGCONFIG(gthread-2.0 GThreadIncDir GThreadLinkDir GThreadLinkFlags GThreadCflags)
-      if (GTKCflags)
+      pkg_check_modules(GTK gtk+-x11-2.0)
+      pkg_check_modules(GThread gthread-2.0)
+      if (GTK_FOUND)
           set(KMPLAYER_WITH_NPP 1)
-      endif (GTKCflags)
-    endif (GLibDBusCflags)
+      endif()
+    endif()
   endif (KMPLAYER_BUILT_WITH_NPP)
 
   if (KMPLAYER_BUILT_WITH_EXPAT)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,20 +4,9 @@
 
 ########### next target ###############
 
-SET(optionalCFlags)
-SET(optionalLinkFlags)
-
-IF (KMPLAYER_WITH_CAIRO)
-    SET(optionalCFlags ${optionalCFlags} ${CAIROCFlags})
-    SET(optionalLinkFlags ${optionalLinkFlags} ${CAIROLinkFlags})
-    MESSAGE("have cairo cflags:${optionalCFlags} ldflags:${optionalLinkFlags}")
-endif (KMPLAYER_WITH_CAIRO)
-
 add_definitions(-DKMPLAYER_VERSION_STRING="\\\"${KMPLAYER_VERSION_STRING}\\\"")
 
-ADD_DEFINITIONS(${CAIROCFlags})
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR} ${CAIROIncDir} ${EXPAT_INCLUDE_DIRS})
+include_directories(${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR} ${CAIRO_INCLUDE_DIRS} ${EXPAT_INCLUDE_DIRS})
 
 set(libkmplayercommon_SRCS
   kmplayerview.cpp
@@ -60,14 +49,9 @@
 
 add_library(kmplayercommon SHARED ${libkmplayercommon_SRCS})
 
-MESSAGE("extra ${CAIROCflags} ${GLibDBusCflags}  libs ${CAIROLinkFlags} ${GLibDBusLinkFlags}")
-
-SET_TARGET_PROPERTIES(kmplayercommon PROPERTIES COMPILE_FLAGS
-    "${CAIROCflags}")
-
 target_link_libraries(kmplayercommon
    LINK_PRIVATE
-  ${CAIROLinkFlags}
+  ${CAIRO_LIBRARIES}
   KF5::KDELibs4Support
   KF5::Parts
   ${XCB_LIBRARIES}
@@ -135,11 +119,9 @@
 
     add_executable(knpplayer ${knpplayer_SRCS})
 
-    SET_TARGET_PROPERTIES(knpplayer PROPERTIES COMPILE_FLAGS
-        "${GLibDBusCflags} ${GTKCflags} ${GThreadCflags} ${GModuleCflags}"
-    )
+    include_directories(${GLibDBus_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS} ${GThread_INCLUDE_DIRS} ${GModule_INCLUDE_DIRS})
 
-    target_link_libraries(knpplayer ${GLibDBusLinkFlags} ${GTKLinkFlags} ${GThreadLinkFlags} ${GModuleLinkFlags}
+    target_link_libraries(knpplayer ${GLibDBus_LIBRARIES} ${GTK_LIBRARIES} ${GThread_LIBRARIES} ${GModule_LIBRARIES}
         ${X11_X11_LIB} )
 
     install(TARGETS knpplayer ${INSTALL_TARGETS_DEFAULT_ARGS})