[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice/kexi/kexidb/drivers
From: Jarosław Staniek <staniek () kde ! org>
Date: 2010-01-29 21:56:26
Message-ID: 1264802186.770275.18846.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1082177 by staniek:
SQLite driver build: use SQLITE_* variables, use macro_log_feature
M +10 -30 CMakeLists.txt
M +2 -37 sqlite/CMakeLists.txt
--- trunk/koffice/kexi/kexidb/drivers/CMakeLists.txt #1082176:1082177
@@ -2,16 +2,19 @@
# drivers will be moved out of this dir in Predicate, and then area will be redefined
#remove_definitions(-DKDE_DEFAULT_DEBUG_AREA)
#add_definitions(-DKDE_DEFAULT_DEBUG_AREA=44001)
-INCLUDE (FindPkgConfig)
+SET (SQLITE_MIN_VERSION "3.6.20")
+IF(NOT WIN32)
+ INCLUDE (FindPkgConfig)
+ pkg_check_modules (SQLITE3 REQUIRED sqlite3>=3.6.20) #todo let's have this check in FindSqlite instead
+ENDIF(NOT WIN32)
-pkg_check_modules (SQLITE3 REQUIRED sqlite3>=3.6.20)
-
-IF (SQLITE3_FOUND)
+INCLUDE (MacroLogFeature)
+INCLUDE (FindSqlite)
+macro_log_feature(SQLITE_FOUND "SQLite" "SQLite is an embedded SQL database engine." \
"http://www.sqlite.org" TRUE SQLITE_MIN_VERSION "Required by the default Kexi database driver.") +IF \
(SQLITE_FOUND) add_subdirectory( sqlite )
-ENDIF (SQLITE3_FOUND)
+ENDIF (SQLITE_FOUND)
-#ancient add_subdirectory( sqlite2 )
-
INCLUDE (FindMySQL)
IF (MYSQL_FOUND)
add_subdirectory( mySQL )
@@ -42,26 +45,3 @@
#message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(pgsql_dir)")
#message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(mysql_dir)")
-
-
-
-########### install files ###############
-
-
-
-
-
-
-#original Makefile.am contents follow:
-
-#if compile_mysql_plugin
-#mysql_dir=mySQL
-#endif
-#
-#
-#if compile_pgsql_plugin
-#pgsql_dir=pqxx
-#endif
-#
-#SUBDIRS = sqlite sqlite2 $(pgsql_dir) $(mysql_dir)
-#
--- trunk/koffice/kexi/kexidb/drivers/sqlite/CMakeLists.txt #1082176:1082177
@@ -1,6 +1,6 @@
-include_directories( ${CMAKE_SOURCE_DIR}/kexi ${CMAKE_SOURCE_DIR}/kexi/kexidb ${KDE4_INCLUDES} )
+include_directories( ${SQLITE_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/kexi ${CMAKE_SOURCE_DIR}/kexi/kexidb \
${KDE4_INCLUDES} )
ADD_DEFINITIONS( -D__KEXIDB__= )
@@ -20,46 +20,11 @@
kde4_add_plugin(kexidb_sqlite3driver ${kexidb_sqlite3driver_PART_SRCS})
+target_link_libraries(kexidb_sqlite3driver ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KPARTS_LIBS} \
${SQLITE_LIBRARIES} kexidb kexiutils )
-
-target_link_libraries(kexidb_sqlite3driver ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KPARTS_LIBS} sqlite3 kexidb \
kexiutils )
-
install(TARGETS kexidb_sqlite3driver DESTINATION ${PLUGIN_INSTALL_DIR})
########### install files ###############
install( FILES kexidb_sqlite3driver.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-
-
-
-
-
-#original Makefile.am contents follow:
-
-#include $(top_srcdir)/kexi/Makefile.global
-#
-#kde_module_LTLIBRARIES = kexidb_sqlite3driver.la
-#
-#INCLUDES = -I$(top_srcdir)/kexi/3rdparty/kexisql3/src -I$(srcdir)/../.. \
-# -I$(top_srcdir)/kexi $(all_includes)
-#
-#kexidb_sqlite3driver_la_METASOURCES = AUTO
-#
-#kexidb_sqlite3driver_la_SOURCES = sqliteconnection.cpp sqlitedriver.cpp sqlitecursor.cpp \
-#sqlitekeywords.cpp sqlitepreparedstatement.cpp
-#
-#kexidb_sqlite3driver_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) \
-# $(top_builddir)/kexi/3rdparty/kexisql3/src/libkexisql3.la \
-# $(top_builddir)/kexi/kexidb/libkexidb.la \
-# $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la
-#
-#kexidb_sqlite3driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO)
-#
-#
-#kde_services_DATA = kexidb_sqlite3driver.desktop
-#
-#
-#KDE_CXXFLAGS += -DKEXIDB_SQLITE_DRIVER_EXPORT= -D__KEXIDB__= \
-# -include $(top_srcdir)/kexi/kexidb/global.h
-#
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic