From 027b335e36a1702f5197330321d71403a789f0d3 Mon Sep 17 00:00:00 2001 From: DrSlony Date: Sun, 9 Sep 2012 18:49:24 +0100 Subject: [PATCH] Updated dependency versions in CMakeLists.txt and COMPILE.txt, issue 1547 --- CMakeLists.txt | 2 +- COMPILE.txt | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 662a7ff3d..976130136 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -164,7 +164,7 @@ find_package(PkgConfig) pkg_check_modules (GTK REQUIRED gtk+-2.0>=2.12) pkg_check_modules (GLIB2 REQUIRED glib-2.0>=2.16) pkg_check_modules (GLIBMM REQUIRED glibmm-2.4>=2.16) -pkg_check_modules (GTKMM REQUIRED gtkmm-2.4>=2.12) +pkg_check_modules (GTKMM REQUIRED gtkmm-2.4>=2.22) pkg_check_modules (GIO REQUIRED gio-2.0>=2.16) pkg_check_modules (GIOMM REQUIRED giomm-2.4>=2.12) pkg_check_modules (GTHREAD REQUIRED gthread-2.0>=2.16) diff --git a/COMPILE.txt b/COMPILE.txt index a2368638c..d011bd781 100644 --- a/COMPILE.txt +++ b/COMPILE.txt @@ -73,10 +73,10 @@ DEPENDENCIES EXIV2 exiv2>=0.19 http://www.exiv2.org/ EXPAT expat>=2.1.0 http://expat.sourceforge.net/ FFTW fftw>=3.2.2 http://fftw.org/ - GLIB2 glib-2.0>=2.16 http://www.gtk.org/ - GLIBMM glibmm-2.4>=2.16 http://www.gtkmm.org - GTK+ gtk+-2.0>=2.12 http://www.gtk.org/ - GTKMM gtkmm-2.4>=2.12 http://www.gtkmm.org + GLIB2 glib-2.0>=2.24 http://www.gtk.org/ + GLIBMM glibmm-2.4>=2.24 http://www.gtkmm.org + GTK+ gtk+-2.0>=2.22 http://www.gtk.org/ + GTKMM gtkmm-2.4>=2.22 http://www.gtkmm.org JPEG libjpeg>=6b http://libjpeg-turbo.virtualgl.org/ http://jpegclub.org/ http://www.ijg.org/ @@ -131,7 +131,7 @@ WINDOWS http://www.mingw.org/wiki/MSYS - CMake - http://www.cmake.org/cmake/resources/software.html Version 2.8.8 or above is required for this platform - - Gtkmm2.22 + - gtkmm-2.22 - for 32bit: http://ftp.se.debian.org/pub/gnome/binaries/win32/gtkmm/2.22/ - for 64bit: @@ -210,7 +210,7 @@ WINDOWS Open an MSYS console, that will create a Linux environment, and compile the dependencies in the following order: zlib: - If you have Gtkmm-2.22 installed, you should skip this zlib section. + If you have gtkmm-2.22 installed, you should skip this zlib section. - Download: http://zlib.net/ - How to build: cd to the directory you unpacked zlib-1.2.5 to,