diff options
| author | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-04-12 02:30:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-12 02:30:59 -0700 |
| commit | 0e000644053015b7f7a0985e14f0bd384c847d17 (patch) | |
| tree | 7e456fd12b3bf281b28587338f1650017c8b32ab /ports/sqlitecpp | |
| parent | 93ce6b4f27602cd18f4327c2cfd84093d472b8bb (diff) | |
| parent | 39ba5b2b30c9f7b49e777a62093cdd49d05b53a9 (diff) | |
| download | vcpkg-0e000644053015b7f7a0985e14f0bd384c847d17.tar.gz vcpkg-0e000644053015b7f7a0985e14f0bd384c847d17.zip | |
Merge branch 'master' into master
Diffstat (limited to 'ports/sqlitecpp')
| -rw-r--r-- | ports/sqlitecpp/0001-Find-external-sqlite3.patch | 2 | ||||
| -rw-r--r-- | ports/sqlitecpp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/sqlitecpp/portfile.cmake | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/ports/sqlitecpp/0001-Find-external-sqlite3.patch b/ports/sqlitecpp/0001-Find-external-sqlite3.patch index ef6700e14..f9473ff53 100644 --- a/ports/sqlitecpp/0001-Find-external-sqlite3.patch +++ b/ports/sqlitecpp/0001-Find-external-sqlite3.patch @@ -16,7 +16,7 @@ index 4a3e492..f7e22a5 100644 # TODO NOCOMMIT -#find_package(sqlite3) -+find_package(sqlite3 REQUIRED) ++find_package(sqlite3 CONFIG) +target_link_libraries(SQLiteCpp PRIVATE sqlite3) #if(sqlite3_VERSION VERSION_LESS "3.19") # set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT") diff --git a/ports/sqlitecpp/CONTROL b/ports/sqlitecpp/CONTROL index 133ac6703..119c94091 100644 --- a/ports/sqlitecpp/CONTROL +++ b/ports/sqlitecpp/CONTROL @@ -1,4 +1,4 @@ Source: sqlitecpp -Version: 2.2 +Version: 2.2-1 Build-Depends: sqlite3 Description: SQLiteC++ (SQLiteCpp) is a smart and easy to use C++ SQLite3 wrapper. diff --git a/ports/sqlitecpp/portfile.cmake b/ports/sqlitecpp/portfile.cmake index 2af9c8cfa..a7e9a4267 100644 --- a/ports/sqlitecpp/portfile.cmake +++ b/ports/sqlitecpp/portfile.cmake @@ -23,6 +23,7 @@ vcpkg_configure_cmake( -DSQLITECPP_RUN_CPPCHECK=OFF -DSQLITECPP_INTERNAL_SQLITE=OFF -DSQLITE_ENABLE_COLUMN_METADATA=OFF + -DSQLITECPP_INTERNAL_SQLITE=OFF ) vcpkg_install_cmake() |