From b43063e2fd9d585e90cb0645017fc55857512d90 Mon Sep 17 00:00:00 2001
From: Matthieu Penant <matthieu.penant@seika.ca>
Date: Tue, 4 Jun 2024 01:42:38 -0400
Subject: [PATCH] [Snap7] Fixes #33328 - remove c++ wrappers (#39066)

Fixes #33328
---
 ports/snap7/CMakeLists.txt | 4 ----
 ports/snap7/vcpkg.json     | 2 +-
 versions/baseline.json     | 2 +-
 versions/s-/snap7.json     | 5 +++++
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ports/snap7/CMakeLists.txt b/ports/snap7/CMakeLists.txt
index 5dcf75ace6..c2a530b430 100644
--- a/ports/snap7/CMakeLists.txt
+++ b/ports/snap7/CMakeLists.txt
@@ -37,8 +37,6 @@ add_library(${PROJECT_NAME} SHARED "core/s7_client.cpp"
                                    "sys/sol_threads.h"
                                    "sys/unix_threads.h"
                                    "sys/win_threads.h"
-                                   "../release/Wrappers/c-cpp/snap7.h"
-                                   "../release/Wrappers/c-cpp/snap7.cpp"
                                    )
 
 if(MSVC)
@@ -51,7 +49,6 @@ add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
 target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/core> $<INSTALL_INTERFACE:include>)
 target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib> $<INSTALL_INTERFACE:include>)
 target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/sys> $<INSTALL_INTERFACE:include>)
-target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../release/Wrappers/c-cpp> $<INSTALL_INTERFACE:include>)
 
 install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME})
 
@@ -66,5 +63,4 @@ if(NOT DISABLE_INSTALL_HEADERS)
   install(DIRECTORY "core/" DESTINATION include/${PROJECT_NAME} FILES_MATCHING PATTERN "*.h")
   install(DIRECTORY "lib/" DESTINATION include/${PROJECT_NAME} FILES_MATCHING PATTERN "*.h")
   install(DIRECTORY "sys/" DESTINATION include/${PROJECT_NAME} FILES_MATCHING PATTERN "*.h")
-  install(DIRECTORY "../release/Wrappers/c-cpp/" DESTINATION include/${PROJECT_NAME} FILES_MATCHING PATTERN "*.h")
 endif()
diff --git a/ports/snap7/vcpkg.json b/ports/snap7/vcpkg.json
index 4655012b41..7b7d0f6eae 100644
--- a/ports/snap7/vcpkg.json
+++ b/ports/snap7/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "snap7",
   "version": "1.4.2",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Snap7",
   "homepage": "https://snap7.sourceforge.net/",
   "license": "LGPL-3.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index ff7d02b7c2..e6d104a750 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -8202,7 +8202,7 @@
     },
     "snap7": {
       "baseline": "1.4.2",
-      "port-version": 1
+      "port-version": 2
     },
     "snappy": {
       "baseline": "1.1.10",
diff --git a/versions/s-/snap7.json b/versions/s-/snap7.json
index dfacb41844..9a254fcb26 100644
--- a/versions/s-/snap7.json
+++ b/versions/s-/snap7.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a5d8bb0bb1a47a7e6c583d30f4c394d23704d130",
+      "version": "1.4.2",
+      "port-version": 2
+    },
     {
       "git-tree": "9183c4fc6d65ae695c68f0481e5a7dc0067f65fe",
       "version": "1.4.2",