diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-08-02 08:19:01 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-08-02 08:19:01 +0200 |
| commit | a7522bf319187e9137cb42b5040a7adc7a295963 (patch) | |
| tree | 5008c6fbf68220d5133e8ece926d691d19412077 | |
| parent | 788dac3b0992a4ea67553564ad5e90c29babbb42 (diff) | |
| download | ufo-filters-a7522bf319187e9137cb42b5040a7adc7a295963.tar.gz ufo-filters-a7522bf319187e9137cb42b5040a7adc7a295963.tar.bz2 ufo-filters-a7522bf319187e9137cb42b5040a7adc7a295963.tar.xz ufo-filters-a7522bf319187e9137cb42b5040a7adc7a295963.zip | |
Lower GLib requirements for HZG
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | common/cmake/FindOpenCL.cmake | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ac1145..e1deacc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,8 +23,8 @@ endif () # --- Find packages and libraries --------------------------------------------- find_package(OpenCL REQUIRED) find_package(PkgConfig REQUIRED) -pkg_check_modules(GLIB2 glib-2.0>=2.24 REQUIRED) -pkg_check_modules(GOBJECT2 gobject-2.0>=2.24 REQUIRED) +pkg_check_modules(GLIB2 glib-2.0>=2.22 REQUIRED) +pkg_check_modules(GOBJECT2 gobject-2.0>=2.22 REQUIRED) pkg_check_modules(UFO ufo>=0.2 REQUIRED) include_directories( diff --git a/common/cmake/FindOpenCL.cmake b/common/cmake/FindOpenCL.cmake index a7db3d1..f1b1301 100644 --- a/common/cmake/FindOpenCL.cmake +++ b/common/cmake/FindOpenCL.cmake @@ -50,6 +50,7 @@ ELSE (APPLE) FIND_LIBRARY(OPENCL_LIBRARIES OpenCL ENV LD_LIBRARY_PATH /usr/lib/nvidia-current + /usr/lib64/nvidia /opt/nvidia-current /opt/AMDAPP/lib ) |