cmake: Data cleanup

- explicitly list files
- use find_package for MySQL and ODBC
- remove unused code
- remove unnecessary include dirs
- support unbundled SQLite3
- replace tabs by spaces

Reviewed-by: Roger Meier <r.meier@siemens.com>

Data/CMakeLists.txt

@@ -1,8 +1,43 @@
 set(LIBNAME "PocoData")
 
-set(SRCS "")
-aux_source_directory(src SRCS)
-include_directories( SQLite/include )
+set(SRCS
+    src/AbstractBinder.cpp
+    src/AbstractBinding.cpp
+    src/AbstractExtraction.cpp
+    src/AbstractExtractor.cpp
+    src/AbstractPreparation.cpp
+    src/AbstractPreparator.cpp
+    src/ArchiveStrategy.cpp
+    src/Bulk.cpp
+    src/Connector.cpp
+    src/DataException.cpp
+    src/Date.cpp
+    src/DynamicLOB.cpp
+    src/Limit.cpp
+    src/MetaColumn.cpp
+    src/PooledSessionHolder.cpp
+    src/PooledSessionImpl.cpp
+    src/Position.cpp
+    src/Range.cpp
+    src/RecordSet.cpp
+    src/Row.cpp
+    src/RowFilter.cpp
+    src/RowFormatter.cpp
+    src/RowIterator.cpp
+    src/Session.cpp
+    src/SessionFactory.cpp
+    src/SessionImpl.cpp
+    src/SessionPoolContainer.cpp
+    src/SessionPool.cpp
+    src/SimpleRowFormatter.cpp
+    src/SQLChannel.cpp
+    src/Statement.cpp
+    src/StatementCreator.cpp
+    src/StatementImpl.cpp
+    src/Time.cpp
+    src/Transaction.cpp
+)
+
 
 if (NOT POCO_STATIC)
     add_definitions(-DData_EXPORTS -DTHREADSAFE -DODBC_EXPORTS -DMySQL_EXPORTS -DSQLite_EXPORTS)
@@ -32,14 +67,15 @@ install(
     RUNTIME DESTINATION bin
     )
 
+# SQlite3 is built in any case
 add_subdirectory( SQLite )
 
+find_package(MySQL)
 if(MYSQL_FOUND)
     add_subdirectory( MySQL )
 endif(MYSQL_FOUND)
 
-include(FindODBC)
-
+find_package(ODBC)
 if(CMAKE_SYSTEM MATCHES "Windows")
     message(STATUS "Windows native ODBC Support Enabled")
     add_subdirectory( ODBC )

Data/MySQL/CMakeLists.txt

@@ -1,12 +1,21 @@
 set(LIBNAME "PocoDataMySQL")
 
-set(SRCS "")
-aux_source_directory(src SRCS)
+set(SRCS
+    src/Binder.cpp
+    src/Connector.cpp
+    src/Extractor.cpp
+    src/MySQLException.cpp
+    src/MySQLStatementImpl.cpp
+    src/ResultMetadata.cpp
+    src/SessionHandle.cpp
+    src/SessionImpl.cpp
+    src/StatementExecutor.cpp
+    src/Utility.cpp
+)
 
 add_definitions(-DTHREADSAFE -DNO_TCL)
 
 include_directories( include ${MYSQL_INCLUDE_DIR})
-#link_directories( )
 
 add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} )
 set_target_properties( ${LIBNAME} 

Data/SQLite/CMakeLists.txt

@@ -1,23 +1,22 @@
 set(LIBNAME  "PocoDataSQLite")
 
-include_directories( include src )
-
-set(SRCS "")
-
 set(SRCS
     src/Binder.cpp
     src/Connector.cpp
     src/Extractor.cpp
     src/Notifier.cpp
+    src/SessionImpl.cpp
     src/SQLiteException.cpp
     src/SQLiteStatementImpl.cpp
-	src/SessionImpl.cpp
     src/Utility.cpp
 )
 
+include_directories( "include" src )
 
 if (POCO_UNBUNDLED)
-	set(DATASQLITELIBS PocoData PocoFoundation sqlite3)
+    find_package(SQLite3)
+    set(DATASQLITELIBS PocoData PocoFoundation ${SQLITE3_LIBRARIES})
+    include_directories(${SQLITE3_INCLUDE_DIRS})
 else()
     set(SRCS ${SRCS} src/sqlite3.c)
     set(DATASQLITELIBS PocoData PocoFoundation)