[patch] Proposed patch for CMakeLists.txt

digikam-1.9.0-mysql.patch (text/plain), 3.31 KB, created by provod on 2011-05-09 16:36:37 UTC

diff -ruN digikam-1.9.0-vanilla/CMakeLists.txt digikam-1.9.0/CMakeLists.txt
--- digikam-1.9.0-vanilla/CMakeLists.txt	2011-02-28 02:16:18.000000000 +0600
+++ digikam-1.9.0/CMakeLists.txt	2011-05-09 19:45:02.000000000 +0700
@@ -2,6 +2,7 @@
 
 OPTION(ENABLE_THEMEDESIGNER "Build digiKam theme designer (default=OFF)" OFF)
 OPTION(ENABLE_THUMBS_DB "Build digiKam with thumbnails database support (default=ON)" ON)
+OPTION(ENABLE_MYSQL "Build digiKam with MySQL database support (default=ON)" ON)
 
 # ==================================================================================================
 # Information to update before to release this package.
@@ -189,20 +190,22 @@
     SET(KEXIV2_FOR_DIGIKAM TRUE)
 ENDIF(NOT WIN32)
 
+IF (ENABLE_MYSQL)
 # Check MySQL executables
-FIND_PROGRAM( SERVERCMD_MYSQL mysqld
-              PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/local/libexec
-                    /opt/mysql/libexec /usr/mysql/bin /opt/mysql/sbin ${MYSQLD_PATH}
-                    ENV MYSQLD_PATH )
-MESSAGE(STATUS "Found MySQL server executable at: ${SERVERCMD_MYSQL}")
+	FIND_PROGRAM( SERVERCMD_MYSQL mysqld
+        	      PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec /opt/local/libexec
+                	    /opt/mysql/libexec /usr/mysql/bin /opt/mysql/sbin ${MYSQLD_PATH}
+	                    ENV MYSQLD_PATH )
+	MESSAGE(STATUS "Found MySQL server executable at: ${SERVERCMD_MYSQL}")
 
 # NOTE: under windows, mysql_install_db PERL script is named "mysql_install_db.pl"
 #       under MACOS-X, through macports project, mysql_install_db PERL script is named "mysql_install_db5"
-FIND_PROGRAM( INITCMD_MYSQL mysql_install_db mysql_install_db5 mysql_install_db.pl
-              PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec
-                    /opt/mysql/libexec /usr/mysql/bin /opt/mysql/bin ${MYSQL_TOOLS_PATH}
-                    ENV MYSQL_TOOLS_PATH )
-MESSAGE(STATUS "Found MySQL install_db executable at: ${INITCMD_MYSQL}")
+	FIND_PROGRAM( INITCMD_MYSQL mysql_install_db mysql_install_db5 mysql_install_db.pl
+        	      PATHS /usr/sbin /usr/local/sbin /usr/libexec /usr/local/libexec
+                	    /opt/mysql/libexec /usr/mysql/bin /opt/mysql/bin ${MYSQL_TOOLS_PATH}
+	                    ENV MYSQL_TOOLS_PATH )
+	MESSAGE(STATUS "Found MySQL install_db executable at: ${INITCMD_MYSQL}")
+ENDIF (ENABLE_MYSQL)
 
 # ==================================================================================================
 # Optional dependencies
@@ -274,10 +277,12 @@
 MESSAGE(STATUS "")
 
 PRINT_QTMODULE_STATUS("Qt4 SQL" QT_QTSQL_FOUND)
-PRINT_EXECUTABLE_STATUS("MySQL Server" mysqld MYSQLD_PATH SERVERCMD_MYSQL)
-IF (NOT WIN32)
-    PRINT_EXECUTABLE_STATUS("MySQL install_db tool" mysql_install_db MYSQL_TOOLS_PATH INITCMD_MYSQL)
-ENDIF (NOT WIN32)
+IF (ENABLE_MYSQL)
+	PRINT_EXECUTABLE_STATUS("MySQL Server" mysqld MYSQLD_PATH SERVERCMD_MYSQL)
+	IF (NOT WIN32)
+	    PRINT_EXECUTABLE_STATUS("MySQL install_db tool" mysql_install_db MYSQL_TOOLS_PATH INITCMD_MYSQL)
+	ENDIF (NOT WIN32)
+ENDIF (ENABLE_MYSQL)
 PRINT_LIBRARY_STATUS("libtiff" "http://www.remotesensing.org/libtiff" "" TIFF_FOUND)
 PRINT_LIBRARY_STATUS("libpng" "http://www.libpng.org/pub/png/libpng.html" " (version >= 1.2.7)" PNG_FOUND)
 PRINT_LIBRARY_STATUS("libjasper" "http://www.ece.uvic.ca/~mdadams/jasper" "" JASPER_FOUND)