Skip to content

O
opencv
Switch branch/tag
  1. 13 May, 2014 2 commits
  3. 12 May, 2014 1 commit
  5. 07 May, 2014 1 commit
  7. 29 Apr, 2014 1 commit
  9. 28 Apr, 2014 1 commit
  11. 13 Apr, 2014 5 commits
    • Tony's avatar
      Correction to enable compilation on platform with only GTK2 libs · 265148b9
      Tony authored 
      	modified:   CMakeLists.txt
	modified:   cmake/OpenCVFindLibsGUI.cmake
      265148b9
    • Tony's avatar
      Fix logic error in OpenCVFindLibsGUI.cmake · cb4fffc7
      Tony authored 
      When with_gtk is selected but GTK3 is not present the current logic
fails to check for GTK2. This edit corrects this.
      cb4fffc7
    • Tony's avatar
      Correct error with GTK3 not found selection · c0dbc083
      Tony authored 
      When GTK3 is not found, HAVE_GTK was being set to TRUE. This edit
ensures that HAVE_GTK is only set if GTK3 or GTK2 (meeting minimum
version requirements) is present.
Selection logic for printing 'GTK: No' when the libraries are not found
has also been removed so the message is printed when GTK is not found or
selected in common with other libraries.

Changes committed:
	modified:   CMakeLists.txt
	modified:   cmake/OpenCVFindLibsGUI.cmake
      c0dbc083
    • 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
  13. 12 Apr, 2014 1 commit
  15. 11 Apr, 2014 1 commit
  17. 10 Apr, 2014 1 commit
  19. 09 Apr, 2014 2 commits
    • Tony's avatar
      Correct error with GTK3 not found selection · 2f9dad5c
      Tony authored 
      When GTK3 is not found, HAVE_GTK was being set to TRUE. This edit
ensures that HAVE_GTK is only set if GTK3 or GTK2 (meeting minimum
version requirements) is present.
Selection logic for printing 'GTK: No' when the libraries are not found
has also been removed so the message is printed when GTK is not found or
selected in common with other libraries.

Changes committed:
	modified:   CMakeLists.txt
	modified:   cmake/OpenCVFindLibsGUI.cmake
      2f9dad5c
    • Alexander Alekhin's avatar
      ipp: added support for updated ICV package · 1461ab41
      Alexander Alekhin authored
      1461ab41
  21. 08 Apr, 2014 3 commits
  23. 07 Apr, 2014 3 commits
  25. 03 Apr, 2014 2 commits
  27. 01 Apr, 2014 2 commits
  29. 31 Mar, 2014 1 commit
    • Tony's avatar
      Use GTK_VERSION_MAJOR to switch between GTK+ version two and three · 7f671406
      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
      7f671406
  31. 28 Mar, 2014 1 commit
  33. 22 Mar, 2014 1 commit
  35. 21 Mar, 2014 1 commit
  37. 19 Mar, 2014 1 commit
  39. 18 Mar, 2014 1 commit
  41. 17 Mar, 2014 1 commit
  43. 12 Mar, 2014 1 commit
  45. 06 Mar, 2014 1 commit
  47. 24 Feb, 2014 1 commit
  49. 18 Feb, 2014 1 commit
  51. 17 Feb, 2014 1 commit
  53. 14 Feb, 2014 1 commit
  55. 13 Feb, 2014 1 commit