diff options
| author | Brad King <brad.king@kitware.com> | 2013-11-26 14:35:13 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-11-26 14:35:13 (GMT) |
| commit | 170c50da38d0735059b7729c7429b75e77683af9 (patch) | |
| tree | c296d1d1e88602efa2629c27e24797ee59ce464a | |
| parent | b4727858c482b85a8d0b9d4afb2d77c3167ad770 (diff) | |
| parent | 0e9bf6a257d2a2026bcd1d8f52f5a3d42ff9fabd (diff) | |
| download | CMake-170c50da38d0735059b7729c7429b75e77683af9.zip CMake-170c50da38d0735059b7729c7429b75e77683af9.tar.gz CMake-170c50da38d0735059b7729c7429b75e77683af9.tar.bz2 | |
Merge topic 'FindGTK2-quartz-backend'
0e9bf6a FindGTK2: Add support for Quartz backend on MAC
| -rw-r--r-- | Modules/FindGTK2.cmake | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Modules/FindGTK2.cmake b/Modules/FindGTK2.cmake index 25c482e..bc66337 100644 --- a/Modules/FindGTK2.cmake +++ b/Modules/FindGTK2.cmake @@ -689,7 +689,12 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) _GTK2_FIND_INCLUDE_DIR(GDK gdk/gdk.h) _GTK2_FIND_INCLUDE_DIR(GDKCONFIG gdkconfig.h) if(UNIX) - _GTK2_FIND_LIBRARY (GDK gdk-x11 false true) + if(APPLE) + _GTK2_FIND_LIBRARY (GDK gdk-quartz false true) + endif() + if(NOT GTK2_GDK_FOUND) + _GTK2_FIND_LIBRARY (GDK gdk-x11 false true) + endif() else() _GTK2_FIND_LIBRARY (GDK gdk-win32 false true) endif() @@ -698,7 +703,12 @@ foreach(_GTK2_component ${GTK2_FIND_COMPONENTS}) _GTK2_FIND_INCLUDE_DIR(GTK gtk/gtk.h) if(UNIX) - _GTK2_FIND_LIBRARY (GTK gtk-x11 false true) + if(APPLE) + _GTK2_FIND_LIBRARY (GTK gtk-quartz false true) + endif() + if(NOT GTK2_GTK_FOUND) + _GTK2_FIND_LIBRARY (GTK gtk-x11 false true) + endif() else() _GTK2_FIND_LIBRARY (GTK gtk-win32 false true) endif() |