Updated dependency versions in CMakeLists.txt and COMPILE.txt, issue 1547

This commit is contained in:
DrSlony
2012-09-09 18:49:24 +01:00
parent 1545922a22
commit 027b335e36
2 changed files with 7 additions and 7 deletions

View File

@@ -164,7 +164,7 @@ find_package(PkgConfig)
pkg_check_modules (GTK REQUIRED gtk+-2.0>=2.12) pkg_check_modules (GTK REQUIRED gtk+-2.0>=2.12)
pkg_check_modules (GLIB2 REQUIRED glib-2.0>=2.16) pkg_check_modules (GLIB2 REQUIRED glib-2.0>=2.16)
pkg_check_modules (GLIBMM REQUIRED glibmm-2.4>=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 (GIO REQUIRED gio-2.0>=2.16)
pkg_check_modules (GIOMM REQUIRED giomm-2.4>=2.12) pkg_check_modules (GIOMM REQUIRED giomm-2.4>=2.12)
pkg_check_modules (GTHREAD REQUIRED gthread-2.0>=2.16) pkg_check_modules (GTHREAD REQUIRED gthread-2.0>=2.16)

View File

@@ -73,10 +73,10 @@ DEPENDENCIES
EXIV2 exiv2>=0.19 http://www.exiv2.org/ EXIV2 exiv2>=0.19 http://www.exiv2.org/
EXPAT expat>=2.1.0 http://expat.sourceforge.net/ EXPAT expat>=2.1.0 http://expat.sourceforge.net/
FFTW fftw>=3.2.2 http://fftw.org/ FFTW fftw>=3.2.2 http://fftw.org/
GLIB2 glib-2.0>=2.16 http://www.gtk.org/ GLIB2 glib-2.0>=2.24 http://www.gtk.org/
GLIBMM glibmm-2.4>=2.16 http://www.gtkmm.org GLIBMM glibmm-2.4>=2.24 http://www.gtkmm.org
GTK+ gtk+-2.0>=2.12 http://www.gtk.org/ GTK+ gtk+-2.0>=2.22 http://www.gtk.org/
GTKMM gtkmm-2.4>=2.12 http://www.gtkmm.org GTKMM gtkmm-2.4>=2.22 http://www.gtkmm.org
JPEG libjpeg>=6b http://libjpeg-turbo.virtualgl.org/ JPEG libjpeg>=6b http://libjpeg-turbo.virtualgl.org/
http://jpegclub.org/ http://jpegclub.org/
http://www.ijg.org/ http://www.ijg.org/
@@ -131,7 +131,7 @@ WINDOWS
http://www.mingw.org/wiki/MSYS http://www.mingw.org/wiki/MSYS
- CMake - http://www.cmake.org/cmake/resources/software.html Version 2.8.8 - CMake - http://www.cmake.org/cmake/resources/software.html Version 2.8.8
or above is required for this platform or above is required for this platform
- Gtkmm2.22 - gtkmm-2.22
- for 32bit: - for 32bit:
http://ftp.se.debian.org/pub/gnome/binaries/win32/gtkmm/2.22/ http://ftp.se.debian.org/pub/gnome/binaries/win32/gtkmm/2.22/
- for 64bit: - for 64bit:
@@ -210,7 +210,7 @@ WINDOWS
Open an MSYS console, that will create a Linux environment, and compile Open an MSYS console, that will create a Linux environment, and compile
the dependencies in the following order: the dependencies in the following order:
zlib: 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/ - Download: http://zlib.net/
- How to build: - How to build:
cd to the directory you unpacked zlib-1.2.5 to, cd to the directory you unpacked zlib-1.2.5 to,