diff options
| author | Pino Toscano <pino@kde.org> | 2010-03-17 15:56:16 +0100 |
|---|---|---|
| committer | Pino Toscano <pino@kde.org> | 2010-03-17 15:56:16 +0100 |
| commit | d2dc83cb8de481e44ea584eee77881978af920fa (patch) | |
| tree | a87210da0984dba3824bd10ab07657346807c07e /CMakeLists.txt | |
| parent | 34accfe27305cae18e09243ab2a607287b86fa47 (diff) | |
[CMake] rename GLIB_VERSION to GLIB_REQUIRED
this way it matches autotools, and it is going to not conflict with my next changes
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 149b7f4c..6ba62972 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,7 +66,7 @@ set(TEXTOUT_WORD_LIST ON) set(QT3_MIN_VERSION "3.3.0") set(QT4_MIN_VERSION "4.4.0") set(CAIRO_VERSION "1.8.4") -set(GLIB_VERSION "2.18") +set(GLIB_REQUIRED "2.18") macro_bool_to_01(ENABLE_SPLASH HAVE_SPLASH) find_package(Freetype REQUIRED) @@ -90,7 +90,7 @@ if(CAIRO_FOUND) macro_optional_find_package(GTK) if(GLIB_FOUND) set(ENABLE_GLIB ON) - set(GLIB_REQ "glib-2.0 >= ${GLIB_VERSION} gobject-2.0 >= ${GLIB_VERSION} cairo >= ${CAIRO_VERSION}") + set(GLIB_REQ "glib-2.0 >= ${GLIB_REQUIRED} gobject-2.0 >= ${GLIB_REQUIRED} cairo >= ${CAIRO_VERSION}") set(POPPLER_GLIB_DISABLE_DEPRECATED "${POPPLER_GLIB_DISABLE_DEPRECATED} -DG_DISABLE_DEPRECATED") set(POPPLER_GLIB_DISABLE_SINGLE_INCLUDES "${POPPLER_GLIB_DISABLE_SINGLE_INCLUDES} -DG_DISABLE_SINGLE_INCLUDES") if(GDK_FOUND) |