From efeb03d2023255c2a3c3080b805dfb2fbee32fa4 Mon Sep 17 00:00:00 2001
From: Mats Taraldsvik <mats.taraldsvik@gmail.com>
Date: Tue, 16 Mar 2021 19:47:27 +0100
Subject: [ocilib] fix wrong solution filename (#16625)

* [ocilib] fix wrong solution filename

There is only a single file in proj/dll and that is ocilib_dll_vs2019.sln.

* ran x-add-version on new version

* consolidated platform

* consolidated platform

Co-authored-by: Mats Taraldsvik <mats.taraldsvik@norkart.no>
---
 ports/ocilib/CONTROL        |  5 -----
 ports/ocilib/portfile.cmake | 20 +++-----------------
 ports/ocilib/vcpkg.json     |  8 ++++++++
 versions/baseline.json      |  2 +-
 versions/o-/ocilib.json     |  5 +++++
 5 files changed, 17 insertions(+), 23 deletions(-)
 delete mode 100644 ports/ocilib/CONTROL
 create mode 100644 ports/ocilib/vcpkg.json

diff --git a/ports/ocilib/CONTROL b/ports/ocilib/CONTROL
deleted file mode 100644
index 63f1c0839..000000000
--- a/ports/ocilib/CONTROL
+++ /dev/null
@@ -1,5 +0,0 @@
-Source: ocilib
-Version: 4.7.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 3a11d088d..b510212a5 100644
--- a/ports/ocilib/portfile.cmake
+++ b/ports/ocilib/portfile.cmake
@@ -9,24 +9,10 @@ vcpkg_from_github(
 )
 
 if(VCPKG_TARGET_IS_WINDOWS)
-    if(VCPKG_PLATFORM_TOOLSET MATCHES "v142")
-        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(OCILIB_ARCH_X86 Win32)
-        set(OCILIB_ARCH_X64 Win64)
-    else()
-        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})
+        set(PLATFORM x86)
     else()
-        set(PLATFORM ${OCILIB_ARCH_X64})
+        set(PLATFORM x64)
     endif()
     
     # There is no debug configuration
@@ -34,7 +20,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
     set(VCPKG_BUILD_TYPE release)
     vcpkg_install_msbuild(
         SOURCE_PATH ${SOURCE_PATH}
-        PROJECT_SUBPATH proj/dll/ocilib_dll_${SOLUTION_TYPE}.sln
+        PROJECT_SUBPATH proj/dll/ocilib_dll_vs2019.sln
         INCLUDES_SUBPATH include
         LICENSE_SUBPATH LICENSE
         RELEASE_CONFIGURATION "Release - ANSI"
diff --git a/ports/ocilib/vcpkg.json b/ports/ocilib/vcpkg.json
new file mode 100644
index 000000000..55fe9a900
--- /dev/null
+++ b/ports/ocilib/vcpkg.json
@@ -0,0 +1,8 @@
+{
+  "name": "ocilib",
+  "version-string": "4.7.1",
+  "port-version": 1,
+  "description": "OCILIB is an open source and cross platform Oracle Driver that delivers efficient access to Oracle databases.",
+  "homepage": "https://vrogier.github.io/ocilib/",
+  "supports": "!(arm | uwp)"
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 7f4e2ecbd..c31882ac4 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4230,7 +4230,7 @@
     },
     "ocilib": {
       "baseline": "4.7.1",
-      "port-version": 0
+      "port-version": 1
     },
     "octomap": {
       "baseline": "1.9.5",
diff --git a/versions/o-/ocilib.json b/versions/o-/ocilib.json
index 732c869b7..706e5db6f 100644
--- a/versions/o-/ocilib.json
+++ b/versions/o-/ocilib.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a3316dc22d7227e1886297c9471dcb737412bc84",
+      "version-string": "4.7.1",
+      "port-version": 1
+    },
     {
       "git-tree": "a956cde150fe4a95f62c4586788dafd6587e00e6",
       "version-string": "4.7.1",
-- 
cgit v1.2.3