From e55a58e4be443cde479cfc11ceda04856f07c19b Mon Sep 17 00:00:00 2001 From: Robert Knight Date: Thu, 29 Aug 2013 17:11:43 +0100 Subject: [PATCH] Replace use of deprecated pkgconfig() macro with find_package() MD-19678 #time 15m --- src/CMakeLists.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2b9fb4f..ff47577 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -8,18 +8,15 @@ if (UNIX) add_definitions(-Wall -Werror -Wconversion) endif() -include(UsePkgConfig) -pkgconfig(gtk+-2.0 GTK2_INCLUDE_DIR GTK2_LINK_DIR GTK2_LINK_FLAGS GTK2_CFLAGS) - if (UNIX AND NOT APPLE) set(LINUX TRUE) endif() if (LINUX) - include_directories(${GTK2_INCLUDE_DIR}) - add_definitions(${GTK2_CFLAGS}) + find_package(GTK2 REQUIRED gtk) + include_directories(${GTK2_INCLUDE_DIRS}) add_library(updatergtk SHARED UpdateDialogGtk.cpp UpdateDialogGtk.h) - target_link_libraries(updatergtk ${GTK2_LINK_FLAGS}) + target_link_libraries(updatergtk ${GTK2_LIBRARIES}) endif() add_definitions(-DTIXML_USE_STL)