Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 482156 | Differences between
and this patch

Collapse All | Expand All

(-)mysql-workbench-community-6.0.8-src/CMakeLists.txt (-4 / +12 lines)
Lines 18-23 Link Here
18
find_package(PkgConfig REQUIRED)
18
find_package(PkgConfig REQUIRED)
19
19
20
find_package(GTK2 2.6.2 REQUIRED gtk gtkmm)
20
find_package(GTK2 2.6.2 REQUIRED gtk gtkmm)
21
if (NOT GTK2_FOUND)
22
	message( FATAL_ERROR "Not all GTK2 components were found!" )
23
endif()
21
pkg_check_modules(GTHREAD REQUIRED gthread-2.0)
24
pkg_check_modules(GTHREAD REQUIRED gthread-2.0)
22
pkg_check_modules(GMODULE REQUIRED gmodule-2.0)
25
pkg_check_modules(GMODULE REQUIRED gmodule-2.0)
23
set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${GMODULE_INCLUDE_DIRS})
26
set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${GMODULE_INCLUDE_DIRS})
Lines 32-38 Link Here
32
endif ()
35
endif ()
33
36
34
# All known publicly available versions of Antlr3C are buggy
37
# All known publicly available versions of Antlr3C are buggy
35
38
# see: https://bugzilla.redhat.com/show_bug.cgi?id=966973
39
# patch seems to be only applied partially to antlr-3.4, bug is present in antlr-3.5, too
36
if (SKIP_BUNDLED_ANTLR)
40
if (SKIP_BUNDLED_ANTLR)
37
  find_package(Antlr3C)
41
  find_package(Antlr3C)
38
endif ()
42
endif ()
Lines 71-78 Link Here
71
find_package(TinyXML REQUIRED)
75
find_package(TinyXML REQUIRED)
72
76
73
if (UNIX)
77
if (UNIX)
74
	option(USE_UNIXODBC "Use unixODBC instead of iODBC" OFF)
78
	option(USE_IODBC "Use iODBC instead of unixODBC" ON)
75
	if (USE_UNIXODBC)
79
	if (NOT USE_IODBC)
76
		find_package(UNIXODBC REQUIRED)
80
		find_package(UNIXODBC REQUIRED)
77
		set(ODBC_LIBRARIES ${UNIXODBC_LIBRARIES})
81
		set(ODBC_LIBRARIES ${UNIXODBC_LIBRARIES})
78
		set(ODBC_INCLUDE_DIRS ${UNIXODBC_INCLUDE_DIRS})
82
		set(ODBC_INCLUDE_DIRS ${UNIXODBC_INCLUDE_DIRS})
Lines 89-95 Link Here
89
pkg_check_modules(CAIRO REQUIRED cairo>=1.5.12)
93
pkg_check_modules(CAIRO REQUIRED cairo>=1.5.12)
90
pkg_check_modules(UUID REQUIRED uuid)
94
pkg_check_modules(UUID REQUIRED uuid)
91
pkg_check_modules(LIBZIP REQUIRED libzip)
95
pkg_check_modules(LIBZIP REQUIRED libzip)
92
if (UNIX)
96
97
if (UNIX AND USE_GNOME_KEYRING)
93
	pkg_check_modules(GNOME_KEYRING gnome-keyring-1)
98
	pkg_check_modules(GNOME_KEYRING gnome-keyring-1)
94
	if (GNOME_KEYRING_FOUND)
99
	if (GNOME_KEYRING_FOUND)
95
		set(KEYRING_DEFINITION     "HAVE_GNOME_KEYRING")
100
		set(KEYRING_DEFINITION     "HAVE_GNOME_KEYRING")
Lines 99-104 Link Here
99
			set(KEYRING_DEFINITION     "HAVE_OLD_GNOME_KEYRING")
104
			set(KEYRING_DEFINITION     "HAVE_OLD_GNOME_KEYRING")
100
		endif()
105
		endif()
101
	endif()
106
	endif()
107
	if (NOT GNOME_KEYRING_FOUND) 
108
		message( FATAL_ERROR "Gnome keyring libraries could not be found" )
109
	endif()
102
endif()
110
endif()
103
111
104
include (CheckFunctionExists)
112
include (CheckFunctionExists)

Return to bug 482156