Merge branch 'SRombauts:master' into meson-macos-fix

SRombauts · Dec 14, 2022 · 1b376c8 · 1b376c8
2 parents f9188f8 + 403839d
commit 1b376c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/include/SQLiteCpp/Database.h b/include/SQLiteCpp/Database.h
@@ -35,10 +35,10 @@ __IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_13_0
 
 // disable the support if the required header is not available
 #ifdef __has_include
-    #ifndef __has_include(<filesystem>)
+    #if !__has_include(<filesystem>)
         #undef SQLITECPP_HAVE_STD_FILESYSTEM
     #endif
-    #ifndef __has_include(<experimental/filesystem>)
+    #if !__has_include(<experimental/filesystem>)
         #undef SQLITECPP_HAVE_EXPERIMENTAL_FILESYSTEM
     #endif
 #endif

diff --git a/tests/Database_test.cpp b/tests/Database_test.cpp
@@ -34,13 +34,15 @@ void assertion_failed(const char* apFile, const long apLine, const char* apFunc,
 }
 #endif
 
+#ifdef SQLITECPP_INTERNAL_SQLITE
 TEST(SQLiteCpp, version)
 {
     EXPECT_STREQ(SQLITE_VERSION,        SQLite::VERSION);
     EXPECT_EQ   (SQLITE_VERSION_NUMBER, SQLite::VERSION_NUMBER);
     EXPECT_STREQ(SQLITE_VERSION,        SQLite::getLibVersion());
     EXPECT_EQ   (SQLITE_VERSION_NUMBER, SQLite::getLibVersionNumber());
 }
+#endif
 
 TEST(Database, ctorExecCreateDropExist)
 {