1. 13 Apr, 2014 5 commits
    • Tony's avatar
      Change quotes around GTK headers for angle brackets · 65f63421
      Tony authored
      The linux buildbots have started to fail compilation due to not
      finding the gtk headers. The quotes have been changed to angle brackets
      to indicate to the compiler that these are system includes.
      65f63421
    • Tony's avatar
      Fix bug in GTK+3 logic introduced by previous merge · a28ad40c
      Tony authored
      During merging of conflicting versions of this file, I erroneously
      deleted several lines in the GUI reporting section. This is repaired
      in this commit.
      a28ad40c
    • Tony's avatar
      Improve GTK+ library selection logic. · f318b5bc
      Tony authored
      The new logic will select GTK+3 by default if WITH_GTK is selected. If
      the GTK+3 libraries are not found, then GTK+2 libraries will be selected
      if found.
      This can be overridden by using WITH_GTK_2_X to force selection of GTK+2
      (if found).
      f318b5bc
    • Tony's avatar
      Use GTK_VERSION_MAJOR to switch between GTK+ version two and three · 16383412
      Tony authored
      specific code. As a result of this, HAVE_GTK3 no longer needs to be
      exposed.
      
      The use of HAVE_GTK, and HAVE_ GTK3 have been changed to mirror the
      method used by HAVE_QT and HAVE_QT5.
       On branch gtk3
       Changes to be committed:
              modified:   CMakeLists.txt
              modified:   cmake/OpenCVFindLibsGUI.cmake
              modified:   cmake/templates/cvconfig.h.in
              modified:   modules/highgui/src/window.cpp
              modified:   modules/highgui/src/window_gtk.cpp
      16383412
    • Tony's avatar
      Merge remote-tracking branch 'upstream/master' · befdef96
      Tony authored
      Rebase to lates upstream
      befdef96
  2. 11 Apr, 2014 6 commits
  3. 10 Apr, 2014 8 commits
  4. 09 Apr, 2014 20 commits
  5. 08 Apr, 2014 1 commit