From bcff929875d76ade98c251038eea6f48171facc6 Mon Sep 17 00:00:00 2001
From: Phoebe <925731795@qq.com>
Date: Thu, 1 Aug 2019 04:01:02 +0800
Subject: Add PREFER_NINJA to many ports (#7468)

* Add PREFER_NINJA to many ports
---
 ports/libodb-pgsql/CONTROL        | 2 +-
 ports/libodb-pgsql/portfile.cmake | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'ports/libodb-pgsql')

diff --git a/ports/libodb-pgsql/CONTROL b/ports/libodb-pgsql/CONTROL
index d35291135..a6988eeb0 100644
--- a/ports/libodb-pgsql/CONTROL
+++ b/ports/libodb-pgsql/CONTROL
@@ -1,5 +1,5 @@
 Source: libodb-pgsql
-Version: 2.4.0-2
+Version: 2.4.0-3
 Homepage: https://www.codesynthesis.com/products/odb/
 Description: Description: PostgreSQL support for the ODB ORM library
 Build-Depends: libodb, libpq
diff --git a/ports/libodb-pgsql/portfile.cmake b/ports/libodb-pgsql/portfile.cmake
index 3e31f2aa7..ed9f35034 100644
--- a/ports/libodb-pgsql/portfile.cmake
+++ b/ports/libodb-pgsql/portfile.cmake
@@ -14,6 +14,7 @@ file(COPY
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
     OPTIONS_DEBUG
         -DLIBODB_INSTALL_HEADERS=OFF
 )
-- 
cgit v1.2.3


From 726c11148105a97aef39bec024fdb7c140b1b154 Mon Sep 17 00:00:00 2001
From: Stefano Sinigardi <stesinigardi@hotmail.com>
Date: Mon, 7 Oct 2019 19:35:13 +0200
Subject: [vcpkg] fatal_error when patch fails to apply (#8087)

vcpkg will now fail on failure to apply patches except when using `--head`.
---
 ports/libodb-pgsql/portfile.cmake | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'ports/libodb-pgsql')

diff --git a/ports/libodb-pgsql/portfile.cmake b/ports/libodb-pgsql/portfile.cmake
index ed9f35034..c8a720340 100644
--- a/ports/libodb-pgsql/portfile.cmake
+++ b/ports/libodb-pgsql/portfile.cmake
@@ -1,11 +1,15 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libodb-pgsql-2.4.0)
+
 vcpkg_download_distfile(ARCHIVE
     URLS "http://www.codesynthesis.com/download/odb/2.4/libodb-pgsql-2.4.0.tar.gz"
     FILENAME "libodb-pgsql-2.4.0.tar.gz"
     SHA512 535515356233b815f144c0098940174f7a530e7fa4e930c0a9ebdc255fdb8bac8cdcceac31f25be4864105323e00bfe50808efa648e7c8ffb5a944e52f514b69
 )
-vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+)
 
 file(COPY
   ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
-- 
cgit v1.2.3