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.6-src.orig/CMakeLists.txt (-25 / +29 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 28-34 Link Here
28
pkg_check_modules(GLIB REQUIRED glib-2.0)
31
pkg_check_modules(GLIB REQUIRED glib-2.0)
29
32
30
# All known publicly available versions of Antlr3C are buggy
33
# All known publicly available versions of Antlr3C are buggy
31
34
# see: https://bugzilla.redhat.com/show_bug.cgi?id=966973
35
# patch seems to be only applied partially to antlr-3.4, bug is present in antlr-3.5, too
32
if (SKIP_BUNDLED_ANTLR)
36
if (SKIP_BUNDLED_ANTLR)
33
  find_package(Antlr3C)
37
  find_package(Antlr3C)
34
endif ()
38
endif ()
Lines 66-90 Link Here
66
find_package(VSqlite REQUIRED)
70
find_package(VSqlite REQUIRED)
67
find_package(TinyXML REQUIRED)
71
find_package(TinyXML REQUIRED)
68
72
69
if (UNIX)
73
if (UNIX AND USE_IODBC)
70
	option(USE_UNIXODBC "Use unixODBC instead of iODBC" OFF)
74
	find_package(IODBC REQUIRED)
71
	if (USE_UNIXODBC)
75
	set(ODBC_LIBRARIES ${IODBC_LIBRARIES})
72
		find_package(UNIXODBC REQUIRED)
76
	set(ODBC_INCLUDE_DIRS ${IODBC_INCLUDE_DIRS})
73
		set(ODBC_LIBRARIES ${UNIXODBC_LIBRARIES})
77
else()
74
		set(ODBC_INCLUDE_DIRS ${UNIXODBC_INCLUDE_DIRS})
78
	find_package(UNIXODBC REQUIRED)
75
	else ()
79
	set(ODBC_LIBRARIES ${UNIXODBC_LIBRARIES})
76
		find_package(IODBC REQUIRED)
80
	set(ODBC_INCLUDE_DIRS ${UNIXODBC_INCLUDE_DIRS})
77
		set(ODBC_LIBRARIES ${IODBC_LIBRARIES})
81
endif()
78
		set(ODBC_INCLUDE_DIRS ${IODBC_INCLUDE_DIRS})
79
	endif()
80
endif ()
81
82
82
pkg_check_modules(PCRE REQUIRED libpcre libpcrecpp)
83
pkg_check_modules(PCRE REQUIRED libpcre libpcrecpp)
83
pkg_check_modules(CAIRO REQUIRED cairo>=1.5.12)
84
pkg_check_modules(CAIRO REQUIRED cairo>=1.5.12)
84
pkg_check_modules(SQLITE3 REQUIRED sqlite3)
85
pkg_check_modules(SQLITE3 REQUIRED sqlite3)
85
pkg_check_modules(UUID REQUIRED uuid)
86
pkg_check_modules(UUID REQUIRED uuid)
86
pkg_check_modules(LIBZIP REQUIRED libzip)
87
pkg_check_modules(LIBZIP REQUIRED libzip)
87
if (UNIX)
88
89
if (UNIX AND USE_GNOME_KEYRING)
88
	pkg_check_modules(GNOME_KEYRING gnome-keyring-1)
90
	pkg_check_modules(GNOME_KEYRING gnome-keyring-1)
89
	if (GNOME_KEYRING_FOUND)
91
	if (GNOME_KEYRING_FOUND)
90
		set(KEYRING_DEFINITION     "HAVE_GNOME_KEYRING")
92
		set(KEYRING_DEFINITION     "HAVE_GNOME_KEYRING")
Lines 94-99 Link Here
94
			set(KEYRING_DEFINITION     "HAVE_OLD_GNOME_KEYRING")
96
			set(KEYRING_DEFINITION     "HAVE_OLD_GNOME_KEYRING")
95
		endif()
97
		endif()
96
	endif()
98
	endif()
99
	if (NOT GNOME_KEYRING_FOUND) 
100
		message( FATAL_ERROR "Gnome keyring libraries could not be found" )
101
	endif()
97
endif()
102
endif()
98
103
99
include (CheckFunctionExists)
104
include (CheckFunctionExists)
Lines 144-150 Link Here
144
    CONFIGURE_COMMAND autoreconf -i -s && ${PROJECT_SOURCE_DIR}/ext/antlr-runtime/configure
149
    CONFIGURE_COMMAND autoreconf -i -s && ${PROJECT_SOURCE_DIR}/ext/antlr-runtime/configure
145
        --prefix=${PROJECT_BINARY_DIR}/antlr-wb
150
        --prefix=${PROJECT_BINARY_DIR}/antlr-wb
146
        --libdir=${PROJECT_BINARY_DIR}/antlr-wb
151
        --libdir=${PROJECT_BINARY_DIR}/antlr-wb
147
	--disable-abiflags
152
        --disable-abiflags
148
    BUILD_COMMAND make
153
    BUILD_COMMAND make
149
    BUILD_IN_SOURCE 1
154
    BUILD_IN_SOURCE 1
150
    INSTALL_COMMAND make install
155
    INSTALL_COMMAND make install
Lines 225-242 Link Here
225
install(FILES ${CMAKE_BINARY_DIR}/mysql-workbench.desktop DESTINATION ${WB_INSTALL_SHARED_DIR}/applications)
230
install(FILES ${CMAKE_BINARY_DIR}/mysql-workbench.desktop DESTINATION ${WB_INSTALL_SHARED_DIR}/applications)
226
install(FILES ${CMAKE_BINARY_DIR}/mysql-workbench.conf DESTINATION ${WB_INSTALL_ETC_DIR}/ld.so.conf.d)
231
install(FILES ${CMAKE_BINARY_DIR}/mysql-workbench.conf DESTINATION ${WB_INSTALL_ETC_DIR}/ld.so.conf.d)
227
232
228
if (EXISTS COPYING)
233
if (EXISTS ${PROJECT_SOURCE_DIR}/COPYING)
229
    install(FILES README COPYING DESTINATION ${WB_INSTALL_DOC_DIR})
234
    install(FILES ${PROJECT_SOURCE_DIR}/README ${PROJECT_SOURCE_DIR}/COPYING DESTINATION ${WB_INSTALL_DOC_DIR})
230
    install(FILES build/debian/mysql-workbench-community.sharedmimeinfo DESTINATION ${WB_INSTALL_SHARED_DIR}/mime/packages RENAME mysql-workbench.xml)
235
    install(FILES ${PROJECT_SOURCE_DIR}/build/debian/mysql-workbench-community.sharedmimeinfo DESTINATION ${WB_INSTALL_SHARED_DIR}/mime/packages RENAME mysql-workbench.xml)
231
    install(FILES build/debian/mysql-workbench-community.mime DESTINATION ${WB_INSTALL_SHARED_DIR}/mime-info RENAME mysql-workbench.mime)
236
    install(FILES ${PROJECT_SOURCE_DIR}/build/debian/mysql-workbench-community.mime DESTINATION ${WB_INSTALL_SHARED_DIR}/mime-info RENAME mysql-workbench.mime)
232
else ()
237
else ()
233
    install(FILES README LICENSE.mysql DESTINATION ${WB_INSTALL_DOC_DIR})
238
    install(FILES ${PROJECT_SOURCE_DIR}/README ${PROJECT_SOURCE_DIR}/LICENSE.mysql DESTINATION ${WB_INSTALL_DOC_DIR})
234
    install(FILES build/debian/mysql-workbench-commercial.sharedmimeinfo DESTINATION ${WB_INSTALL_SHARED_DIR}/mime/packages RENAME mysql-workbench.xml)
239
    install(FILES ${PROJECT_SOURCE_DIR}/build/debian/mysql-workbench-commercial.sharedmimeinfo DESTINATION ${WB_INSTALL_SHARED_DIR}/mime/packages RENAME mysql-workbench.xml)
235
    install(FILES build/debian/mysql-workbench-commercial.mime DESTINATION ${WB_INSTALL_SHARED_DIR}/mime-info RENAME mysql-workbench.mime)
240
    install(FILES ${PROJECT_SOURCE_DIR}/build/debian/mysql-workbench-commercial.mime DESTINATION ${WB_INSTALL_SHARED_DIR}/mime-info RENAME mysql-workbench.mime)
236
endif ()
241
endif ()
237
242
238
install(FILES build/build_freetds.sh
243
install(FILES ${PROJECT_SOURCE_DIR}/build/build_freetds.sh
239
              samples/models/sakila_full.mwb
244
              ${PROJECT_SOURCE_DIR}/samples/models/sakila_full.mwb
240
        DESTINATION ${WB_PACKAGE_SHARED_DIR}/extras
245
        DESTINATION ${WB_PACKAGE_SHARED_DIR}/extras
241
       )
246
       )
242
       

Return to bug 482156