diff options
| author | Pino Toscano <pino@kde.org> | 2010-07-22 21:28:55 +0200 |
|---|---|---|
| committer | Pino Toscano <pino@kde.org> | 2010-07-22 21:28:55 +0200 |
| commit | d0a6f9abdab88ec43004b6766337db304cbf6a25 (patch) | |
| tree | 43a319a5b5d5435c7ab65203c612063eb55df32b /glib | |
| parent | 02d85dd2cc154dbb6caa04a349532033d833edd1 (diff) | |
[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
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | glib/demo/CMakeLists.txt | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt index f3b180ee..fded2e83 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 4d128220..286fbd79 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 |