- 13 Apr, 2014 5 commits
-
-
Tony authored
modified: CMakeLists.txt modified: cmake/OpenCVFindLibsGUI.cmake
-
Tony authored
When with_gtk is selected but GTK3 is not present the current logic fails to check for GTK2. This edit corrects this.
-
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
-
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).
-
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
-
- 12 Apr, 2014 1 commit
-
-
Tony authored
modified: CMakeLists.txt modified: cmake/OpenCVFindLibsGUI.cmake
-
- 10 Apr, 2014 1 commit
-
-
Tony authored
When with_gtk is selected but GTK3 is not present the current logic fails to check for GTK2. This edit corrects this.
-
- 09 Apr, 2014 1 commit
-
-
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
-
- 01 Apr, 2014 1 commit
-
-
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).
-
- 31 Mar, 2014 1 commit
-
-
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
-
- 24 Feb, 2014 1 commit
-
-
Nicolas Martin authored
-
- 26 Nov, 2013 1 commit
-
-
Tony authored
Update to cmake files for to include minimum versions, and tidy up gtk operation. Files updated: CMakeLists.txt: WITH_GTK now uses Gtk3 by default. If not found then Gtk2 is used. WITH_GTK_2_X forces Gtk2.x use cmake/OpenCVFindLibsGUI.cmake Updated selection logic to implement methodology described above. Implemented warning if Gtk3 not found (and not overridden) Implemented error if Gtk does not meet minimum required version cmake/OpenCVMinDepVersions.cmake Added minimum Gtk version of 2.18.0
-
- 04 Oct, 2013 1 commit
-
-
Tony authored
The OpenGL library is not supported on Gtk3 which uses the cairo library for rendering. Cairo, in turn uses hardware acceleration when supported by the underlying system. Some improvement to performance may be gained by useing the cairo-gl and cairo-glx libraries included on modern Gtk3 systems. See the cairo documentation for further information. The following link may also be of interest. http://lists.cairographics.org/archives/cairo/2012-October/023609.html
-
- 02 Oct, 2013 1 commit
-
-
Tony authored
A new option WITH_GTK3 has been added to the cmake configure system to enable compilation under Gtk version 3.The flag HAVE_GTK3 is also introduced to select the new Gtk3 code in the source files. (Gtk2 is disbled when Gtk3 is selected). window_gtk.cpp has been modified to remove obsolete (and deleted from libgtk 3) and introduce new Gtk3 code in its place when compiled for Gtk3. To compile for Gtk2, disable WITH_GTK3 in cmake. To build for Gtk3 both WITH_GTK and WITH_GTK3 must be selected.
-
- 22 Aug, 2013 1 commit
-
-
Roman Donchenko authored
* There's no OPENCV_BINARY_DIR variable; * No need to append CMakeFiles/CMakeTmp, as CMake does it for you; * Output variables are unused; * Wrong usage of CMAKE_FLAGS; * Small quoting and style issues.
-
- 14 Aug, 2013 2 commits
-
-
kamjagin authored
-
Miroslav Kobetski authored
-
- 13 Aug, 2013 1 commit
-
-
Miroslav Kobetski authored
-
- 08 Aug, 2013 1 commit
-
-
Roman Donchenko authored
-
- 10 Jul, 2013 1 commit
-
-
Roman Donchenko authored
Now the HAVE_* macros are set using cvconfig.h. Previously most of them already were there, but were always undefined. One, HAVE_COCOA, I had to add. This also makes the CMake code more consistent; now, WITH_* variables are always checked in cmake/*, while HAVE_* variables are checked in modules/highgui/CMakeLists.txt.
-
- 19 Jun, 2013 1 commit
-
-
Roman Donchenko authored
I don't know why it didn't work for the original author, but it definitely works now.
-
- 06 Jun, 2013 1 commit
-
-
Roman Donchenko authored
Also, removing explicit include path configuration, since QT_USE_FILE takes care of that.
-
- 13 May, 2013 1 commit
-
-
Andrey Kamaev authored
-
- 04 Apr, 2013 1 commit
-
-
Andrey Kamaev authored
Issue #2868
-
- 27 Mar, 2013 1 commit
-
-
Alexander Smorkalov authored
-
- 30 May, 2012 1 commit
-
-
Andrey Kamaev authored
-
- 25 May, 2012 1 commit
-
-
Andrey Kamaev authored
-