[poppler] cmake/modules glib/demo test/CMakeLists.txt

[Albert Astals Cid]

 cmake/modules/FindGTK.cmake |    8 ++++----
 glib/demo/CMakeLists.txt    |    6 +++---
 test/CMakeLists.txt         |    6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 892e486addcbcad619613c7be1ca692a0d36d6e5
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon May 21 20:28:42 2012 +0200

    Compile++

diff --git a/cmake/modules/FindGTK.cmake b/cmake/modules/FindGTK.cmake
index 4d66bd3..1a32483 100644
--- a/cmake/modules/FindGTK.cmake
+++ b/cmake/modules/FindGTK.cmake
@@ -2,8 +2,8 @@
 # Once done this will define
 #
 #  GTK_FOUND - system has GTK
-#  GTK2_CFLAGS - the GTK CFlags
-#  GTK2_LIBRARIES - Link these to use GTK
+#  GTK3_CFLAGS - the GTK CFlags
+#  GTK3_LIBRARIES - Link these to use GTK
 #
 # Copyright 2008-2010 Pino Toscano, <pino at kde.org>
 #
@@ -15,8 +15,8 @@ include(FindPackageHandleStandardArgs)
 if (NOT WIN32)
   find_package(PkgConfig REQUIRED)
 
-  pkg_check_modules(GTK2 "gtk+-2.0>=2.14" "gdk-pixbuf-2.0" "gthread-2.0" "gio-2.0")
+  pkg_check_modules(GTK3 "gtk+-3.0>=3.0" "gdk-pixbuf-2.0" "gthread-2.0" "gio-2.0")
 
-  find_package_handle_standard_args(GTK DEFAULT_MSG GTK2_LIBRARIES GTK2_CFLAGS)
+  find_package_handle_standard_args(GTK DEFAULT_MSG GTK3_LIBRARIES GTK3_CFLAGS)
 
 endif(NOT WIN32)
diff --git a/glib/demo/CMakeLists.txt b/glib/demo/CMakeLists.txt
index 286fbd7..316371e 100644
--- a/glib/demo/CMakeLists.txt
+++ b/glib/demo/CMakeLists.txt
@@ -1,8 +1,8 @@
 include_directories(
-  ${GTK2_INCLUDE_DIRS}
+  ${GTK3_INCLUDE_DIRS}
 )
 
-add_definitions(${GTK2_CFLAGS_OTHER})
+add_definitions(${GTK3_CFLAGS_OTHER})
 
 set(poppler_glib_demo_SRCS
   main.c
@@ -25,4 +25,4 @@ set(poppler_glib_demo_SRCS
   selections.c
 )
 poppler_add_test(poppler-glib-demo BUILD_GTK_TESTS ${poppler_glib_demo_SRCS})
-target_link_libraries(poppler-glib-demo poppler-glib ${GTK2_LIBRARIES})
+target_link_libraries(poppler-glib-demo poppler-glib ${GTK3_LIBRARIES})
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index cff715c..178b15e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -17,7 +17,7 @@ endif (ENABLE_SPLASH)
 
 if (GTK_FOUND)
 
-  add_definitions(${GTK2_CFLAGS})
+  add_definitions(${GTK3_CFLAGS})
 
   include_directories(
     ${CMAKE_SOURCE_DIR}/glib
@@ -28,7 +28,7 @@ if (GTK_FOUND)
     gtk-test.cc
   )
   poppler_add_test(gtk-test BUILD_GTK_TESTS ${gtk_splash_test_SRCS})
-  target_link_libraries(gtk-test poppler-glib ${GTK2_LIBRARIES})
+  target_link_libraries(gtk-test poppler-glib ${GTK3_LIBRARIES})
 
   if (HAVE_CAIRO)
 
@@ -36,7 +36,7 @@ if (GTK_FOUND)
       pdf-inspector.cc
     )
     poppler_add_test(pdf-inspector BUILD_GTK_TESTS ${pdf_inspector_SRCS})
-    target_link_libraries(pdf-inspector poppler-glib ${GTK2_LIBRARIES})
+    target_link_libraries(pdf-inspector poppler-glib ${GTK3_LIBRARIES})
 
   endif (HAVE_CAIRO)