generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correction to enable compilation on platform with only GTK2 libs

Browse Source 
modified:   CMakeLists.txt
	modified:   cmake/OpenCVFindLibsGUI.cmake
This commit is contained in:
Tony 2014-04-12 22:43:42 +01:00
parent 8fd11f477b
commit 512cb4fced
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -749,14 +749,14 @@ else()
endif() endif()
else() else()
if(HAVE_GTK3) if(HAVE_GTK3)
status(" GTK+ 3.x:" HAVE_GTK THEN "YES (ver ${ALIASOF_gtk+-3.0_VERSION})" ELSE NO) status(" GTK+ 3.x:" HAVE_GTK THEN "YES (ver ${ALIASOF_gtk+-3.0_VERSION})" ELSE NO)
elseif(HAVE_GTK) elseif(HAVE_GTK)
status(" GTK+ 2.x:" HAVE_GTK THEN "YES (ver ${ALIASOF_gtk+-2.0_VERSION})" ELSE NO) status(" GTK+ 2.x:" HAVE_GTK THEN "YES (ver ${ALIASOF_gtk+-2.0_VERSION})" ELSE NO)
else() else()
status(" GTK+:" NO) status(" GTK+:" NO)
endif() endif()
status(" GThread :" HAVE_GTHREAD THEN "YES (ver ${ALIASOF_gthread-2.0_VERSION})" ELSE NO) status(" GThread :" HAVE_GTHREAD THEN "YES (ver ${ALIASOF_gthread-2.0_VERSION})" ELSE NO)
status(" GtkGlExt:" HAVE_GTKGLEXT THEN "YES (ver ${ALIASOF_gtkglext-1.0_VERSION})" ELSE NO) status(" GtkGlExt:" HAVE_GTKGLEXT THEN "YES (ver ${ALIASOF_gtkglext-1.0_VERSION})" ELSE NO)
endif() endif()
endif() endif()
endif() endif()

4
cmake/OpenCVFindLibsGUI.cmake
View File

@ -43,7 +43,9 @@ ocv_clear_vars(HAVE_GTK HAVE_GTK3 HAVE_GTHREAD HAVE_GTKGLEXT)
if(WITH_GTK AND NOT HAVE_QT) if(WITH_GTK AND NOT HAVE_QT)
if(NOT WITH_GTK_2_X) if(NOT WITH_GTK_2_X)
CHECK_MODULE(gtk+-3.0 HAVE_GTK3) CHECK_MODULE(gtk+-3.0 HAVE_GTK3)
set(HAVE_GTK HAVE_GTK3) if(HAVE_GTK3)
set(HAVE_GTK TRUE)
endif()
endif() endif()
if(NOT HAVE_GTK) if(NOT HAVE_GTK)
CHECK_MODULE(gtk+-2.0 HAVE_GTK) CHECK_MODULE(gtk+-2.0 HAVE_GTK)