From 7e16e8545f646a61919a51c8c13171fd9e3b3409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Rombauts?= Date: Fri, 1 May 2015 22:46:51 +0200 Subject: [PATCH] Re-enable SQLITE_ENABLE_COLUMN_METADATA by default under Windows --- CMakeLists.txt | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f9d1817..97ea398 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,13 +13,17 @@ project(SQLiteCpp) if (WIN32) set(DEV_NULL "NUL") # build the SQLite3 C library for Windows (for ease of use) - set(SQLITECPP_INTERNAL_SQLITE_DEFAULT ON) - set(SQLITE_ENABLE_COLUMN_METADATA_DEFAULT OFF) -else (WIN32) + set(SQLITECPP_INTERNAL_SQLITE_DEFAULT ON) + set(SQLITE_ENABLE_COLUMN_METADATA_DEFAULT ON) +else (WIN32) # UNIX set(DEV_NULL "/dev/null") # do not build the SQLite3 C library, but uses the Linux/Mac OS X sqlite3-dev package - set(SQLITECPP_INTERNAL_SQLITE_DEFAULT OFF) - set(SQLITE_ENABLE_COLUMN_METADATA_DEFAULT ON) + set(SQLITECPP_INTERNAL_SQLITE_DEFAULT OFF) + if (APPLE) + set(SQLITE_ENABLE_COLUMN_METADATA_DEFAULT OFF) + else (APPLE) + set(SQLITE_ENABLE_COLUMN_METADATA_DEFAULT ON) + endif (APPLE) endif (WIN32) # then Compiler/IDE differences: @@ -243,10 +247,10 @@ else (NOT BIICODE) # Link target with dl for linux if (UNIX) - target_link_libraries(${BII_BLOCK_TARGET} INTERFACE pthread) - if (NOT APPLE) - target_link_libraries(${BII_BLOCK_TARGET} INTERFACE dl) - endif () + target_link_libraries(${BII_BLOCK_TARGET} INTERFACE pthread) + if (NOT APPLE) + target_link_libraries(${BII_BLOCK_TARGET} INTERFACE dl) + endif () endif () endif (NOT BIICODE)