From ada38348ee6a6e5db9c78bbb10ca766a198dde6b Mon Sep 17 00:00:00 2001 From: King_DuckZ Date: Fri, 28 Aug 2020 00:04:31 +0100 Subject: [PATCH] Change SQLiteCpp into a wrap file --- .gitmodules | 3 --- subprojects/SQLiteCpp.wrap | 7 +++++++ subprojects/SQLiteCpp/SQLiteCpp | 1 - subprojects/{ => packagefiles}/SQLiteCpp/meson.build | 4 ++-- subprojects/{ => packagefiles}/SQLiteCpp/meson_options.txt | 0 5 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 subprojects/SQLiteCpp.wrap delete mode 160000 subprojects/SQLiteCpp/SQLiteCpp rename subprojects/{ => packagefiles}/SQLiteCpp/meson.build (94%) rename subprojects/{ => packagefiles}/SQLiteCpp/meson_options.txt (100%) diff --git a/.gitmodules b/.gitmodules index 77654ed..6f69e58 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "subprojects/date"] path = subprojects/date url = https://github.com/HowardHinnant/date.git -[submodule "subprojects/SQLiteCpp/SQLiteCpp"] - path = subprojects/SQLiteCpp/SQLiteCpp - url = https://github.com/SRombauts/SQLiteCpp.git [submodule "src/gnulib"] path = src/gnulib url = git://git.savannah.gnu.org/gnulib.git diff --git a/subprojects/SQLiteCpp.wrap b/subprojects/SQLiteCpp.wrap new file mode 100644 index 0000000..649cb0f --- /dev/null +++ b/subprojects/SQLiteCpp.wrap @@ -0,0 +1,7 @@ +[wrap-git] +url = https://github.com/SRombauts/SQLiteCpp.git +revision = 4e3d36af2d4a612d548f5959532a7b97c9724e6b +patch_directory = SQLiteCpp + +[provide] +dependency_names = SQLiteCpp-3.1.1 diff --git a/subprojects/SQLiteCpp/SQLiteCpp b/subprojects/SQLiteCpp/SQLiteCpp deleted file mode 160000 index d2be4c8..0000000 --- a/subprojects/SQLiteCpp/SQLiteCpp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d2be4c84bfac70c61fded008576e3e9fad17f82e diff --git a/subprojects/SQLiteCpp/meson.build b/subprojects/packagefiles/SQLiteCpp/meson.build similarity index 94% rename from subprojects/SQLiteCpp/meson.build rename to subprojects/packagefiles/SQLiteCpp/meson.build index 333be81..8da3373 100644 --- a/subprojects/SQLiteCpp/meson.build +++ b/subprojects/packagefiles/SQLiteCpp/meson.build @@ -1,7 +1,7 @@ project('SQLiteCpp', 'cpp', - version: '3.0.0', + version: '3.1.1', meson_version: '>=0.49.2', - default_options: ['cpp_std=gnu++11'], + default_options: ['cpp_std=c++11'], ) sqlite_dep = dependency('sqlite3', version: '>=3.32.1') diff --git a/subprojects/SQLiteCpp/meson_options.txt b/subprojects/packagefiles/SQLiteCpp/meson_options.txt similarity index 100% rename from subprojects/SQLiteCpp/meson_options.txt rename to subprojects/packagefiles/SQLiteCpp/meson_options.txt