Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/win_cli_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
# Github runners have two installations of vcpkg, one from Visual
# Studio and one extra. Use the second one explicitly to avoid mixups.
$env:VCPKG_ROOT = "C:\vcpkg"
& $env:VCPKG_ROOT/vcpkg install --triplet x64-windows-static sqlite3
& $env:VCPKG_ROOT/vcpkg install --triplet x64-windows-static sqlite3[rtree]
& $env:VCPKG_ROOT/vcpkg install --triplet x64-windows-static libpq[openssl]
cd $env:GITHUB_WORKSPACE/geodiff
mkdir build
Expand Down
7 changes: 4 additions & 3 deletions geodiff/src/drivers/sqliteutils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,11 @@ void register_gpkg_extensions( std::shared_ptr<Sqlite3Db> db )
throwSqliteError( db->get(), "Failed to enable SQLite extensions loading" );
}

rc = sqlite3_gpkg_auto_init( db->get(), NULL, NULL );
if ( rc )
const char *errmsg = "";
rc = sqlite3_gpkg_auto_init( db->get(), &errmsg, NULL );
if ( rc != SQLITE_OK )
{
throwSqliteError( db->get(), "Failed to initialize GPKG extension" );
throw GeoDiffException( "Failed to initialize GPKG extension [" + std::to_string( rc ) + "]: " + std::string( errmsg ) );
}
}

Expand Down