From d0751cde80631eba0e061f915e96c44ed17bcece Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Tue, 2 Jun 2020 08:52:36 +0800
Subject: [PATCH] [vcpkg baseline][ocilib] Fix build failure (#11646)

* [ocilib] Fix build failure

* Update ports/ocilib/portfile.cmake

* Update ports/ocilib/portfile.cmake

* Update ports/ocilib/portfile.cmake

* Update ports/ocilib/portfile.cmake

Co-authored-by: Lily <47812810+LilyWangL@users.noreply.github.com>
---
 ports/ocilib/CONTROL        |  2 +-
 ports/ocilib/portfile.cmake | 20 ++++++++++++++++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ports/ocilib/CONTROL b/ports/ocilib/CONTROL
index 722223b002..c5d4fbb374 100644
--- a/ports/ocilib/CONTROL
+++ b/ports/ocilib/CONTROL
@@ -1,5 +1,5 @@
 Source: ocilib
-Version: 4.6.4
+Version: 4.6.4-1
 Homepage: https://vrogier.github.io/ocilib/
 Description: OCILIB is an open source and cross platform Oracle Driver that delivers efficient access to Oracle databases.
 Supports: !(arm|uwp)
\ No newline at end of file
diff --git a/ports/ocilib/portfile.cmake b/ports/ocilib/portfile.cmake
index 17e1e0358c..84912c10f6 100644
--- a/ports/ocilib/portfile.cmake
+++ b/ports/ocilib/portfile.cmake
@@ -12,12 +12,24 @@ vcpkg_from_github(
 
 if(VCPKG_TARGET_IS_WINDOWS)
 	if(VCPKG_PLATFORM_TOOLSET MATCHES "v142")
-		set(SOLUTION_TYPE vs2019)
+        set(SOLUTION_TYPE vs2019)
+        set(OCILIB_ARCH_X86 x86)
+        set(OCILIB_ARCH_X64 x64)
 	elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
-		set(SOLUTION_TYPE vs2017)
+        set(SOLUTION_TYPE vs2017)
+        set(OCILIB_ARCH_X86 Win32)
+        set(OCILIB_ARCH_X64 Win64)
 	else()
-		set(SOLUTION_TYPE vs2015)
+        set(SOLUTION_TYPE vs2015)
+        set(OCILIB_ARCH_X86 Win32)
+        set(OCILIB_ARCH_X64 Win64)
 	endif()
+    
+    if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
+        set(PLATFORM ${OCILIB_ARCH_X86})
+    else()
+        set(PLATFORM ${OCILIB_ARCH_X64})
+    endif()
 	
 	# There is no debug configuration
 	# As it is a C library, build the release configuration and copy its output to the debug folder
@@ -28,7 +40,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
 		INCLUDES_SUBPATH include
 		LICENSE_SUBPATH LICENSE
 		RELEASE_CONFIGURATION "Release - ANSI"
-		PLATFORM ${VCPKG_TARGET_ARCHITECTURE}
+		PLATFORM ${PLATFORM}
 		USE_VCPKG_INTEGRATION
 		ALLOW_ROOT_INCLUDES)