cuberite/SQLiteCpp
1
0
Fork 0
mirror of https://github.com/cuberite/SQLiteCpp.git synced 2025-08-06 02:36:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Disable std::filesystem on macOS targetting <10.15

Browse Source 
macOS flat out refuses to compile if you touch std::filesystem when
targetting macOS < 10.15 (to be able to deploy a binary to older macOS
versions).

This disables the std::filesystem support when in C++17 mode with such a
target.
This commit is contained in:
Jason Rhinelander 2021-08-19 22:01:23 -03:00
parent 44bd9c4f38
commit bfe0221b8c
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/SQLiteCpp/Database.h
View File

@ -14,9 +14,24 @@
// c++17: MinGW GCC version > 8 // c++17: MinGW GCC version > 8
// c++17: Visual Studio 2017 version 15.7 // c++17: Visual Studio 2017 version 15.7
#if ((__cplusplus >= 201703L) && ((!defined(__MINGW32__) && !defined(__MINGW64__)) || (__GNUC__ > 8))) || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201703L)) // NOLINT // c++17: macOS unless targetting compatibility with macOS < 10.15
#if __cplusplus >= 201703L
#if defined(__MINGW32__) || defined(__MINGW64__)
#if __GNUC__ > 8 // MinGW requires GCC version > 8 for std::filesystem
#define SQLITECPP_HAVE_STD_FILESYSTEM
#endif
#elif defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101500
// macOS clang won't less us touch std::filesystem if we're targetting earlier than 10.15
#else
#define SQLITECPP_HAVE_STD_FILESYSTEM
#endif
#elif defined(_MSVC_LANG) && _MSVC_LANG >= 201703L
#define SQLITECPP_HAVE_STD_FILESYSTEM
#endif
#ifdef SQLITECPP_HAVE_STD_FILESYSTEM
#include <filesystem> #include <filesystem>
#endif // c++17 #endif // c++17 and a suitable compiler
#include <memory> #include <memory>
#include <string.h> #include <string.h>
@ -167,9 +182,7 @@ public:
{ {
} }
// c++17: MinGW GCC version > 8 #ifdef SQLITECPP_HAVE_STD_FILESYSTEM
// c++17: Visual Studio 2017 version 15.7
#if ((__cplusplus >= 201703L) && ((!defined(__MINGW32__) && !defined(__MINGW64__)) || (__GNUC__ > 8))) || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201703L)) // NOLINT
/** /**
* @brief Open the provided database std::filesystem::path. * @brief Open the provided database std::filesystem::path.
@ -199,7 +212,7 @@ public:
{ {
} }
#endif // c++17 #endif // have std::filesystem
// Database is non-copyable // Database is non-copyable
Database(const Database&) = delete; Database(const Database&) = delete;

9
tests/Database_test.cpp
View File

@ -15,7 +15,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#if (__cplusplus >= 201703L) || ( defined(_MSVC_LANG) && (_MSVC_LANG >= 201703L)) // c++17: Visual Studio 2017 version 15.7 #ifdef SQLITECPP_HAVE_STD_FILESYSTEM
#include <filesystem> #include <filesystem>
#endif // c++17 #endif // c++17
@ -50,12 +50,13 @@ TEST(Database, ctorExecCreateDropExist)
std::string filename = "test.db3"; std::string filename = "test.db3";
EXPECT_THROW(SQLite::Database not_found(filename), SQLite::Exception); EXPECT_THROW(SQLite::Database not_found(filename), SQLite::Exception);
// Create a new database using a string or a std::filesystem::path if using c++17 // Create a new database using a string or a std::filesystem::path if using c++17 and a
#if (__cplusplus >= 201703L) || ( defined(_MSVC_LANG) && (_MSVC_LANG >= 201703L)) // c++17: Visual Studio 2017 version 15.7 // compatible compiler
#ifdef SQLITECPP_HAVE_STD_FILESYSTEM
SQLite::Database db(std::filesystem::path("test.db3"), SQLite::OPEN_READWRITE|SQLite::OPEN_CREATE); SQLite::Database db(std::filesystem::path("test.db3"), SQLite::OPEN_READWRITE|SQLite::OPEN_CREATE);
#else #else
SQLite::Database db("test.db3", SQLite::OPEN_READWRITE|SQLite::OPEN_CREATE); SQLite::Database db("test.db3", SQLite::OPEN_READWRITE|SQLite::OPEN_CREATE);
#endif // c++17 #endif // have std::filesystem
EXPECT_STREQ("test.db3", db.getFilename().c_str()); EXPECT_STREQ("test.db3", db.getFilename().c_str());
EXPECT_FALSE(db.tableExists("test")); EXPECT_FALSE(db.tableExists("test"));