glib/CMakeLists.txt | 5 +++-- glib/demo/CMakeLists.txt | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-)
New commits: commit d0a6f9abdab88ec43004b6766337db304cbf6a25 Author: Pino Toscano <p...@kde.org> Date: Thu Jul 22 21:28:55 2010 +0200 [CMake] improve the way include dirs and cflags for gdk and gtk are set correctly include_directories() for the include dirs, while add the cflags which are not include dirs as definitions diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt index f3b180e..fded2e8 100644 --- a/glib/CMakeLists.txt +++ b/glib/CMakeLists.txt @@ -6,14 +6,15 @@ include_directories( ) add_definitions( -DG_LOG_DOMAIN=\"Poppler\" - ${GLIB2_CFLAGS_OTHERS} + ${GLIB2_CFLAGS_OTHER} ${CAIRO_CFLAGS} ${POPPLER_GLIB_DISABLE_DEPRECATED} ${POPPLER_GLIB_DISABLE_SINGLE_INCLUDES} ) if (GDK_FOUND) - add_definitions(${GDK2_CFLAGS}) + include_directories(${GDK2_INCLUDE_DIRS}) + add_definitions(${GDK2_CFLAGS_OTHER}) endif (GDK_FOUND) configure_file(poppler-features.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/poppler-features.h @ONLY) diff --git a/glib/demo/CMakeLists.txt b/glib/demo/CMakeLists.txt index 4d12822..286fbd7 100644 --- a/glib/demo/CMakeLists.txt +++ b/glib/demo/CMakeLists.txt @@ -1,5 +1,8 @@ +include_directories( + ${GTK2_INCLUDE_DIRS} +) -add_definitions(${GTK2_CFLAGS}) +add_definitions(${GTK2_CFLAGS_OTHER}) set(poppler_glib_demo_SRCS main.c _______________________________________________ poppler mailing list poppler@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/poppler