generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3b177eaaa3
opencv/cmake/OpenCVFindLibsGUI.cmake

91 lines
2.5 KiB
CMake
Raw Normal View History

Merged the trunk r8459:8466 (inclusive)
2012-05-30 11:00:32 +02:00
# ----------------------------------------------------------------------------
# Detect 3rd-party GUI libraries
# ----------------------------------------------------------------------------
HAVE_WIN32UI and HAVE_VFW checks and defines added.
2013-03-27 16:03:51 +01:00
#--- Win32 UI ---
ocv_clear_vars(HAVE_WIN32UI)
if(WITH_WIN32UI)
Fix errors in usages of try_compile * 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.
2013-08-22 13:46:13 +02:00
try_compile(HAVE_WIN32UI
"${OpenCV_BINARY_DIR}"
HAVE_WIN32UI and HAVE_VFW checks and defines added.
2013-03-27 16:03:51 +01:00
"${OpenCV_SOURCE_DIR}/cmake/checks/win32uitest.cpp"
Fix errors in usages of try_compile * 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.
2013-08-22 13:46:13 +02:00
CMAKE_FLAGS "-DLINK_LIBRARIES:STRING=user32;gdi32")
endif()
HAVE_WIN32UI and HAVE_VFW checks and defines added.
2013-03-27 16:03:51 +01:00
Merged the trunk r8459:8466 (inclusive)
2012-05-30 11:00:32 +02:00
# --- QT4 ---
Update CMake scripts to recognize Qt 5.0
2013-04-17 20:02:01 +02:00
ocv_clear_vars(HAVE_QT HAVE_QT5)
Merged the trunk r8459:8466 (inclusive)
2012-05-30 11:00:32 +02:00
if(WITH_QT)
Removed CMake version checks that we don't need anymore.
2013-07-22 11:55:49 +02:00
if(NOT WITH_QT EQUAL 4)
Update CMake scripts to recognize Qt 5.0
2013-04-17 20:02:01 +02:00
find_package(Qt5Core)
find_package(Qt5Gui)
find_package(Qt5Widgets)
find_package(Qt5Test)
find_package(Qt5Concurrent)
if(Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND AND Qt5Concurrent_FOUND)
set(HAVE_QT5 ON)
set(HAVE_QT ON)
find_package(Qt5OpenGL)
if(Qt5OpenGL_FOUND)
set(QT_QTOPENGL_FOUND ON)
endif()
endif()
endif()
if(NOT HAVE_QT)
Fix a missing header path when building with Qt 4. Also, removing explicit include path configuration, since QT_USE_FILE takes care of that.
2013-06-06 12:09:33 +02:00
find_package(Qt4 REQUIRED QtCore QtGui QtTest)
Update CMake scripts to recognize Qt 5.0
2013-04-17 20:02:01 +02:00
if(QT4_FOUND)
set(HAVE_QT TRUE)
endif()
Merged the trunk r8459:8466 (inclusive)
2012-05-30 11:00:32 +02:00
endif()
endif()
# --- GTK ---
These changes introduce Gtk3 support into the highgui module. 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.
2013-10-02 22:16:40 +02:00
ocv_clear_vars(HAVE_GTK HAVE_GTK3 HAVE_GTHREAD HAVE_GTKGLEXT)
Merged the trunk r8459:8466 (inclusive)
2012-05-30 11:00:32 +02:00
if(WITH_GTK AND NOT HAVE_QT)
Improve GTK+ library selection logic. 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).
2014-04-02 00:01:18 +02:00
if(NOT WITH_GTK_2_X)
CHECK_MODULE(gtk+-3.0 HAVE_GTK3)
Correction to enable compilation on platform with only GTK2 libs modified: CMakeLists.txt modified: cmake/OpenCVFindLibsGUI.cmake
2014-04-12 23:43:42 +02:00
if(HAVE_GTK3)
set(HAVE_GTK TRUE)
endif()
Fix logic error in OpenCVFindLibsGUI.cmake When with_gtk is selected but GTK3 is not present the current logic fails to check for GTK2. This edit corrects this.
2014-04-11 00:28:23 +02:00
endif()
if(NOT HAVE_GTK)
These changes introduce Gtk3 support into the highgui module. 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.
2013-10-02 22:16:40 +02:00
CHECK_MODULE(gtk+-2.0 HAVE_GTK)
mprove Gtk2/3 options in cmake 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
2013-11-26 22:35:03 +01:00
if(HAVE_GTK AND (ALIASOF_gtk+-2.0_VERSION VERSION_LESS MIN_VER_GTK))
Use GTK_VERSION_MAJOR to switch between GTK+ version two and three 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
2014-03-31 23:05:09 +02:00
message (FATAL_ERROR "GTK support requires a minimum version of ${MIN_VER_GTK} (${ALIASOF_gtk+-2.0_VERSION} found)")
Correct error with GTK3 not found selection 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
2014-04-09 23:07:59 +02:00
set(HAVE_GTK FALSE)
mprove Gtk2/3 options in cmake 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
2013-11-26 22:35:03 +01:00
endif()
These changes introduce Gtk3 support into the highgui module. 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.
2013-10-02 22:16:40 +02:00
endif()
Merged the trunk r8459:8466 (inclusive)
2012-05-30 11:00:32 +02:00
CHECK_MODULE(gthread-2.0 HAVE_GTHREAD)
Correct error with GTK3 not found selection 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
2014-04-09 23:07:59 +02:00
if(HAVE_GTK AND NOT HAVE_GTHREAD)
Use GTK_VERSION_MAJOR to switch between GTK+ version two and three 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
2014-03-31 23:05:09 +02:00
message(FATAL_ERROR "gthread not found. This library is required when building with GTK support")
mprove Gtk2/3 options in cmake 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
2013-11-26 22:35:03 +01:00
endif()
Disable OpenGL when Gtk3 is selected 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
2013-10-05 00:09:45 +02:00
if(WITH_OPENGL AND NOT HAVE_GTK3)
Merged the trunk r8459:8466 (inclusive)
2012-05-30 11:00:32 +02:00
CHECK_MODULE(gtkglext-1.0 HAVE_GTKGLEXT)
endif()
endif()
# --- OpenGl ---
ocv_clear_vars(HAVE_OPENGL HAVE_QT_OPENGL)
if(WITH_OPENGL)
Improve CMake checks for the OpenGL availability Issue #2868
2013-04-04 09:57:00 +02:00
if(WITH_WIN32UI OR (HAVE_QT AND QT_QTOPENGL_FOUND) OR HAVE_GTKGLEXT)
Merged the trunk r8459:8466 (inclusive)
2012-05-30 11:00:32 +02:00
find_package (OpenGL QUIET)
if(OPENGL_FOUND)
set(HAVE_OPENGL TRUE)
list(APPEND OPENCV_LINKER_LIBS ${OPENGL_LIBRARIES})
if(QT_QTOPENGL_FOUND)
set(HAVE_QT_OPENGL TRUE)
else()
ocv_include_directories(${OPENGL_INCLUDE_DIR})
endif()
endif()
endif()
endif(WITH_OPENGL)
Refactored detecting several Apple-related technologies. 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.
2013-07-10 16:20:34 +02:00
# --- Carbon & Cocoa ---
if(APPLE)
if(WITH_CARBON)
set(HAVE_CARBON YES)
Do not build apple objective-c codes if using gcc
2014-02-21 07:39:48 +01:00
elseif(NOT IOS AND CMAKE_COMPILER_IS_CLANGCXX)
Refactored detecting several Apple-related technologies. 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.
2013-07-10 16:20:34 +02:00
set(HAVE_COCOA YES)
endif()
endif()
Reference in New Issue Copy Permalink