3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 03:10:57 +08:00
Code Issues Projects Releases Wiki Activity

[soem]Update version to latest. (#31889)

Browse Source 
* Switch soem to version-date for rolling head library

* update database

* Remove unused patches and correct port-version

* update database

* review changes

* database update

* Update license to use new function

* update database

* Disable Werror soem

* update database
This commit is contained in:
Ómar Högni Guðmarsson 2023-06-14 03:51:38 +00:00 committed by GitHub
parent 45287bdd9d
commit f69780b5c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 44 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ports/soem/disable-werror.patch
View File

@ -1,23 +1,9 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1778965..4c481b7 100644
index 7fa930c..e14b1bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,21 +13,18 @@ set(BUILD_TESTS TRUE)
if(WIN32)
set(OS "win32")
- find_path(winpcap_INCLUDE_DIRS NAMES pcap.h)
- find_library(winpcap_LIBRARY NAMES wpcap)
- find_library(packet_LIBRARY NAMES packet)
- include_directories(${winpcap_INCLUDE_DIRS})
+ find_path(winpcap_INCLUDE_DIRS NAMES pcap.h)
+ find_library(winpcap_LIBRARY NAMES wpcap)
+ find_library(packet_LIBRARY NAMES packet)
+ include_directories(${winpcap_INCLUDE_DIRS})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_NO_WARNINGS")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
- set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib)
+ set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib)
@@ -31,12 +31,10 @@ if(WIN32)
set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib)
elseif(UNIX AND NOT APPLE)
set(OS "linux")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
@ -29,7 +15,7 @@ index 1778965..4c481b7 100644
set(OS_LIBS pthread pcap)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "rt-kernel")
set(OS "rtk")
@@ -36,10 +33,6 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "rt-kernel")
@@ -45,10 +43,6 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "rt-kernel")
include_directories(oshw/${OS}/${ARCH})
file(GLOB OSHW_EXTRA_SOURCES oshw/${OS}/${ARCH}/*.c)
set(OSHW_SOURCES "${OS_HW_SOURCES} ${OSHW_ARCHSOURCES}")
@ -39,4 +25,4 @@ index 1778965..4c481b7 100644
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-format")
set(OS_LIBS "-Wl,--start-group -l${BSP} -l${ARCH} -lkern -ldev -lsio -lblock -lfs -lusb -llwip -leth -li2c -lrtc -lcan -lnand -lspi -lnor -lpwm -ladc -ltrace -lc -lm -Wl,--end-group")
elseif(${CMAKE_SYSTEM_NAME} MATCHES "rtems")
message("Building for RTEMS")
message(STATUS "Building for RTEMS")

9
ports/soem/portfile.cmake
View File

@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO OpenEtherCATsociety/SOEM
REF abbf0d42e38d6cfbaa4c1e9e8e07ace651c386fd #v1.4.0
SHA512 2967775c6746bb63becea5eb12f136c184bbf874e1e5e8753374bfc212ec9cefbf1159350e79627b978af3562d261b61c50f38936a425c4d9c70598a1d136817
REF a901500618405760a564e64a6816705e29f50f9f
SHA512 d554bc1c3780b1a81402a7fda490f516caba6bd943a28482740b5c9d97e4273a11546e79c92796487ee9901f568cbf1b329d4e1c1d32602fdce0088a77c82443
HEAD_REF master
PATCHES
winpcap.patch
@ -13,6 +13,8 @@ vcpkg_from_github(
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DBUILD_TESTS=OFF
)
vcpkg_cmake_install()
@ -22,7 +24,8 @@ file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/bin"
"${CURRENT_PACKAGES_DIR}/debug/bin"
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/share"
)
# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

3
ports/soem/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "soem",
"version": "1.4.0",
"port-version": 4,
"version-date": "2023-06-09",
"description": "Simple Open Source EtherCAT Master",
"homepage": "https://github.com/OpenEtherCATsociety/SOEM",
"supports": "!uwp",

48
ports/soem/winpcap.patch
View File

@ -1,23 +1,25 @@
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -13,15 +13,13 @@
if(WIN32)
set(OS "win32")
- include_directories(oshw/win32/wpcap/Include)
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- link_directories(${CMAKE_SOURCE_DIR}/oshw/win32/wpcap/Lib/x64)
- elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
- link_directories(${CMAKE_SOURCE_DIR}/oshw/win32/wpcap/Lib)
- endif()
+ find_path(winpcap_INCLUDE_DIRS NAMES pcap.h)
+ find_library(winpcap_LIBRARY NAMES wpcap)
+ find_library(packet_LIBRARY NAMES packet)
+ include_directories(${winpcap_INCLUDE_DIRS})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_NO_WARNINGS")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
- set(OS_LIBS wpcap.lib Packet.lib Ws2_32.lib Winmm.lib)
+ set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib)
elseif(UNIX AND NOT APPLE)
set(OS "linux")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
diff --git a/CMakeLists.txt b/CMakeLists.txt
index baf26bd..7fa930c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,15 +22,13 @@ endif()
if(WIN32)
set(OS "win32")
- include_directories(oshw/win32/wpcap/Include)
- if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- link_directories(${CMAKE_CURRENT_LIST_DIR}/oshw/win32/wpcap/Lib/x64)
- elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
- link_directories(${CMAKE_CURRENT_LIST_DIR}/oshw/win32/wpcap/Lib)
- endif()
+ find_path(winpcap_INCLUDE_DIRS NAMES pcap.h)
+ find_library(winpcap_LIBRARY NAMES wpcap)
+ find_library(packet_LIBRARY NAMES packet)
+ include_directories(${winpcap_INCLUDE_DIRS})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_NO_WARNINGS")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
- set(OS_LIBS wpcap.lib Packet.lib Ws2_32.lib Winmm.lib)
+ set(OS_LIBS ${winpcap_LIBRARY} ${packet_LIBRARY} Ws2_32.lib Winmm.lib)
elseif(UNIX AND NOT APPLE)
set(OS "linux")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")

4
versions/baseline.json
View File

@ -7581,8 +7581,8 @@
"port-version": 1
},
"soem": {
"baseline": "1.4.0",
"port-version": 4
"baseline": "2023-06-09",
"port-version": 0
},
"soil": {
"baseline": "2021-04-22",

5
versions/s-/soem.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a02a02f57a58361241f7bb0890de819f94e198b3",
"version-date": "2023-06-09",
"port-version": 0
},
{
"git-tree": "442917830f982b5c1cfcf3a74fd251d92ddab6e9",
"version": "1.4.0",