mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 19:25:27 +08:00
185a7aa23a
* [sqlite3] Control features with a configuration header rather than CMake or pkgconfig. Resolves https://github.com/microsoft/vcpkg/pull/29335 Alternate of https://github.com/microsoft/vcpkg/pull/29258 @Neumann-A points out that controlling features through CMake configs and pkgconfig causes MSBuild customers to be left out in the cold. Moreover, attempting to add parenthesis to the SQLITE_API marco breaks autotools. This change makes such parenthesis unnecessary and ensures the configuration bits are used with automatic linking. * Ensure feature controls affect the .c too, use less MAYBE_UNUSED. * Correctly note that zlib has no effect without tools. * Always add DL_LIBS even when static linking. * [sqlitecpp] Unconditionally enable column metadata because that is done in the sqlite3 port. * Add missing -l prefix on CMAKE_DL_LIBS
25 lines
650 B
Diff
25 lines
650 B
Diff
diff --git a/sqlite3.c b/sqlite3.c
|
|
index a290c82..a5d4d97 100644
|
|
--- a/sqlite3.c
|
|
+++ b/sqlite3.c
|
|
@@ -17,6 +17,7 @@
|
|
** language. The code for the "sqlite3" command-line shell is also in a
|
|
** separate file. This file contains only code for the core SQLite library.
|
|
*/
|
|
+#include <sqlite3-vcpkg-config.h>
|
|
#define SQLITE_CORE 1
|
|
#define SQLITE_AMALGAMATION 1
|
|
#ifndef SQLITE_PRIVATE
|
|
diff --git a/sqlite3.h b/sqlite3.h
|
|
index 24b9167..9fd81b9 100644
|
|
--- a/sqlite3.h
|
|
+++ b/sqlite3.h
|
|
@@ -32,6 +32,7 @@
|
|
*/
|
|
#ifndef SQLITE3_H
|
|
#define SQLITE3_H
|
|
+#include "./sqlite3-vcpkg-config.h"
|
|
#include <stdarg.h> /* Needed for the definition of va_list */
|
|
|
|
/*
|