[Snap7] Fixes #33328 - remove c++ wrappers (#39066)

Fixes #33328
This commit is contained in:
Matthieu Penant 2024-06-04 01:42:38 -04:00 committed by GitHub
parent cec6b3798e
commit b43063e2fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 6 deletions

View File

@ -37,8 +37,6 @@ add_library(${PROJECT_NAME} SHARED "core/s7_client.cpp"
"sys/sol_threads.h" "sys/sol_threads.h"
"sys/unix_threads.h" "sys/unix_threads.h"
"sys/win_threads.h" "sys/win_threads.h"
"../release/Wrappers/c-cpp/snap7.h"
"../release/Wrappers/c-cpp/snap7.cpp"
) )
if(MSVC) 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}/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}/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}/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}) 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 "core/" DESTINATION include/${PROJECT_NAME} FILES_MATCHING PATTERN "*.h")
install(DIRECTORY "lib/" 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 "sys/" DESTINATION include/${PROJECT_NAME} FILES_MATCHING PATTERN "*.h")
install(DIRECTORY "../release/Wrappers/c-cpp/" DESTINATION include/${PROJECT_NAME} FILES_MATCHING PATTERN "*.h")
endif() endif()

View File

@ -1,7 +1,7 @@
{ {
"name": "snap7", "name": "snap7",
"version": "1.4.2", "version": "1.4.2",
"port-version": 1, "port-version": 2,
"description": "Snap7", "description": "Snap7",
"homepage": "https://snap7.sourceforge.net/", "homepage": "https://snap7.sourceforge.net/",
"license": "LGPL-3.0", "license": "LGPL-3.0",

View File

@ -8202,7 +8202,7 @@
}, },
"snap7": { "snap7": {
"baseline": "1.4.2", "baseline": "1.4.2",
"port-version": 1 "port-version": 2
}, },
"snappy": { "snappy": {
"baseline": "1.1.10", "baseline": "1.1.10",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "a5d8bb0bb1a47a7e6c583d30f4c394d23704d130",
"version": "1.4.2",
"port-version": 2
},
{ {
"git-tree": "9183c4fc6d65ae695c68f0481e5a7dc0067f65fe", "git-tree": "9183c4fc6d65ae695c68f0481e5a7dc0067f65fe",
"version": "1.4.2", "version": "1.4.2",