From f1d33af80cb995c555cdff2e2282579670a25d42 Mon Sep 17 00:00:00 2001 From: wangli28 Date: Mon, 1 Jun 2020 10:32:51 +0000 Subject: [PATCH] [ocilib] Fix build error on Visual Studio 2017 --- ports/ocilib/CONTROL | 2 +- ports/ocilib/portfile.cmake | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ports/ocilib/CONTROL b/ports/ocilib/CONTROL index 722223b0020fb8..c5d4fbb3742c95 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 17e1e0358c11bc..b7ae1da90124b0 100644 --- a/ports/ocilib/portfile.cmake +++ b/ports/ocilib/portfile.cmake @@ -15,6 +15,11 @@ if(VCPKG_TARGET_IS_WINDOWS) set(SOLUTION_TYPE vs2019) elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141") set(SOLUTION_TYPE vs2017) + if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(VCPKG_TARGET_ARCHITECTURE "Win64") + elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(VCPKG_TARGET_ARCHITECTURE "Win32") + endif() else() set(SOLUTION_TYPE vs2015) endif()