[patch] necessary patch for CMakeLists.txt

mysql-workbench-6.0.6-CMakeLists.patch (text/plain), 5.81 KB, created by H.Habighorst on 2013-09-01 18:00:46 UTC

--- mysql-workbench-community-6.0.6-src.orig/CMakeLists.txt	2013-08-09 17:32:52.000000000 +0200
+++ mysql-workbench-community-6.0.6-src/CMakeLists.txt	2013-09-01 19:20:00.124565096 +0200
@@ -18,6 +18,9 @@
 find_package(PkgConfig REQUIRED)
 
 find_package(GTK2 2.6.2 REQUIRED gtk gtkmm)
+if (NOT GTK2_FOUND)
+	message( FATAL_ERROR "Not all GTK2 components were found!" )
+endif()
 pkg_check_modules(GTHREAD REQUIRED gthread-2.0)
 pkg_check_modules(GMODULE REQUIRED gmodule-2.0)
 set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${GTHREAD_INCLUDE_DIRS} ${GMODULE_INCLUDE_DIRS})
@@ -27,18 +30,17 @@
 
 pkg_check_modules(GLIB REQUIRED glib-2.0)
 
-# All known publicly available versions of Antlr3C are buggy
+# try to determine the system ANTLR3C library (antlr-c package)
+find_library(ANTLR3C_LIBRARIES
+	NAMES libantlr3c.so
+	PATHS "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}"
+)
+find_path(ANTLR3C_INCLUDE_DIRS
+	NAMES antlr3.h
+	PATHS "${CMAKE_INSTALL_PREFIX}/include"
+)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(ANTLR3C REQUIRED_VARS ANTLR3C_LIBRARIES ANTLR3C_INCLUDE_DIRS)
 
-if (SKIP_BUNDLED_ANTLR)
-  find_package(Antlr3C)
-endif ()
-if (ANTLR3C_FOUND)
-  set(ANTLR3C_REQUIRED_VERSION "3.4")
-  if (${ANTLR3C_VERSION} VERSION_LESS ${ANTLR3C_REQUIRED_VERSION})
-    message("Required antlr3c version ${ANTLR3C_REQUIRED_VERSION} but ${ANTLR3C_VERSION} found, using bundled version")
-    unset(ANTLR3C_FOUND)
-  endif ()
-endif ()
 
 # In Ubuntu 13.04, the built-in check for python fails.. so we have to resort to the check with pkg-config (which doesn't work in many distros)
 find_package(PythonLibs)
@@ -66,25 +68,23 @@
 find_package(VSqlite REQUIRED)
 find_package(TinyXML REQUIRED)
 
-if (UNIX)
-	option(USE_UNIXODBC "Use unixODBC instead of iODBC" OFF)
-	if (USE_UNIXODBC)
-		find_package(UNIXODBC REQUIRED)
-		set(ODBC_LIBRARIES ${UNIXODBC_LIBRARIES})
-		set(ODBC_INCLUDE_DIRS ${UNIXODBC_INCLUDE_DIRS})
-	else ()
-		find_package(IODBC REQUIRED)
-		set(ODBC_LIBRARIES ${IODBC_LIBRARIES})
-		set(ODBC_INCLUDE_DIRS ${IODBC_INCLUDE_DIRS})
-	endif()
-endif ()
+if (UNIX AND USE_IODBC)
+	find_package(IODBC REQUIRED)
+	set(ODBC_LIBRARIES ${IODBC_LIBRARIES})
+	set(ODBC_INCLUDE_DIRS ${IODBC_INCLUDE_DIRS})
+else()
+	find_package(UNIXODBC REQUIRED)
+	set(ODBC_LIBRARIES ${UNIXODBC_LIBRARIES})
+	set(ODBC_INCLUDE_DIRS ${UNIXODBC_INCLUDE_DIRS})
+endif()
 
 pkg_check_modules(PCRE REQUIRED libpcre libpcrecpp)
 pkg_check_modules(CAIRO REQUIRED cairo>=1.5.12)
 pkg_check_modules(SQLITE3 REQUIRED sqlite3)
 pkg_check_modules(UUID REQUIRED uuid)
 pkg_check_modules(LIBZIP REQUIRED libzip)
-if (UNIX)
+
+if (UNIX AND USE_GNOME_KEYRING)
 	pkg_check_modules(GNOME_KEYRING gnome-keyring-1)
 	if (GNOME_KEYRING_FOUND)
 		set(KEYRING_DEFINITION     "HAVE_GNOME_KEYRING")
@@ -94,6 +94,9 @@
 			set(KEYRING_DEFINITION     "HAVE_OLD_GNOME_KEYRING")
 		endif()
 	endif()
+	if (NOT GNOME_KEYRING_FOUND) 
+		message( FATAL_ERROR "Gnome keyring libraries could not be found" )
+	endif()
 endif()
 
 include (CheckFunctionExists)
@@ -134,23 +137,7 @@
 include(ExternalProject)
 
 if (NOT ANTLR3C_FOUND)
-  message("Using bundled Antlr C runtime")
-  #  Use for Antlr3 the one we have in /ext:
-  set(ANTLR3C_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/ext/antlr-runtime ${PROJECT_SOURCE_DIR}/ext/antlr-runtime/include)
-  set(ANTLR3C_LIBRARIES "-L${PROJECT_BINARY_DIR}/antlr-wb -lantlr3c_wb")
-
-  ExternalProject_Add(antlr-wb
-    SOURCE_DIR ${PROJECT_SOURCE_DIR}/ext/antlr-runtime
-    CONFIGURE_COMMAND autoreconf -i -s && ${PROJECT_SOURCE_DIR}/ext/antlr-runtime/configure
-        --prefix=${PROJECT_BINARY_DIR}/antlr-wb
-        --libdir=${PROJECT_BINARY_DIR}/antlr-wb
-	--disable-abiflags
-    BUILD_COMMAND make
-    BUILD_IN_SOURCE 1
-    INSTALL_COMMAND make install
-  )
-
-  link_directories(${PROJECT_BINARY_DIR}/antlr-wb)
+  message( FATAL_ERROR "Unable to find ANTLR3C Runtime.")
 endif ()
 
 # Uncomment these lines if at any time you want to force the configure and/or build
@@ -225,14 +212,14 @@
 install(FILES ${CMAKE_BINARY_DIR}/mysql-workbench.desktop DESTINATION ${WB_INSTALL_SHARED_DIR}/applications)
 install(FILES ${CMAKE_BINARY_DIR}/mysql-workbench.conf DESTINATION ${WB_INSTALL_ETC_DIR}/ld.so.conf.d)
 
-if (EXISTS COPYING)
-    install(FILES README COPYING DESTINATION ${WB_INSTALL_DOC_DIR})
-    install(FILES build/debian/mysql-workbench-community.sharedmimeinfo DESTINATION ${WB_INSTALL_SHARED_DIR}/mime/packages RENAME mysql-workbench.xml)
-    install(FILES build/debian/mysql-workbench-community.mime DESTINATION ${WB_INSTALL_SHARED_DIR}/mime-info RENAME mysql-workbench.mime)
+if (EXISTS ${PROJECT_SOURCE_DIR}/COPYING)
+    install(FILES ${PROJECT_SOURCE_DIR}/README ${PROJECT_SOURCE_DIR}/COPYING DESTINATION ${WB_INSTALL_DOC_DIR})
+    install(FILES ${PROJECT_SOURCE_DIR}/build/debian/mysql-workbench-community.sharedmimeinfo DESTINATION ${WB_INSTALL_SHARED_DIR}/mime/packages RENAME mysql-workbench.xml)
+    install(FILES ${PROJECT_SOURCE_DIR}/build/debian/mysql-workbench-community.mime DESTINATION ${WB_INSTALL_SHARED_DIR}/mime-info RENAME mysql-workbench.mime)
 else ()
-    install(FILES README LICENSE.mysql DESTINATION ${WB_INSTALL_DOC_DIR})
-    install(FILES build/debian/mysql-workbench-commercial.sharedmimeinfo DESTINATION ${WB_INSTALL_SHARED_DIR}/mime/packages RENAME mysql-workbench.xml)
-    install(FILES build/debian/mysql-workbench-commercial.mime DESTINATION ${WB_INSTALL_SHARED_DIR}/mime-info RENAME mysql-workbench.mime)
+    install(FILES ${PROJECT_SOURCE_DIR}/README ${PROJECT_SOURCE_DIR}/LICENSE.mysql DESTINATION ${WB_INSTALL_DOC_DIR})
+    install(FILES ${PROJECT_SOURCE_DIR}/build/debian/mysql-workbench-commercial.sharedmimeinfo DESTINATION ${WB_INSTALL_SHARED_DIR}/mime/packages RENAME mysql-workbench.xml)
+    install(FILES ${PROJECT_SOURCE_DIR}/build/debian/mysql-workbench-commercial.mime DESTINATION ${WB_INSTALL_SHARED_DIR}/mime-info RENAME mysql-workbench.mime)
 endif ()
 
 install(FILES build/build_freetds.sh