early-access version 2853
This commit is contained in:
42
externals/vcpkg/ports/soem/disable-werror.patch
vendored
Executable file
42
externals/vcpkg/ports/soem/disable-werror.patch
vendored
Executable file
@@ -0,0 +1,42 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1778965..4c481b7 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)
|
||||
elseif(UNIX AND NOT APPLE)
|
||||
set(OS "linux")
|
||||
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
|
||||
set(OS_LIBS pthread rt)
|
||||
elseif(APPLE)
|
||||
# This must come *before* linux or MacOSX will identify as Unix.
|
||||
set(OS "macosx")
|
||||
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
|
||||
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")
|
||||
include_directories(oshw/${OS}/${ARCH})
|
||||
file(GLOB OSHW_EXTRA_SOURCES oshw/${OS}/${ARCH}/*.c)
|
||||
set(OSHW_SOURCES "${OS_HW_SOURCES} ${OSHW_ARCHSOURCES}")
|
||||
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
|
||||
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-but-set-variable")
|
||||
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
|
||||
- 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")
|
||||
28
externals/vcpkg/ports/soem/portfile.cmake
vendored
Executable file
28
externals/vcpkg/ports/soem/portfile.cmake
vendored
Executable file
@@ -0,0 +1,28 @@
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO OpenEtherCATsociety/SOEM
|
||||
REF abbf0d42e38d6cfbaa4c1e9e8e07ace651c386fd #v1.4.0
|
||||
SHA512 2967775c6746bb63becea5eb12f136c184bbf874e1e5e8753374bfc212ec9cefbf1159350e79627b978af3562d261b61c50f38936a425c4d9c70598a1d136817
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
winpcap.patch
|
||||
disable-werror.patch
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
file(REMOVE_RECURSE
|
||||
${CURRENT_PACKAGES_DIR}/bin
|
||||
${CURRENT_PACKAGES_DIR}/debug/bin
|
||||
${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
|
||||
14
externals/vcpkg/ports/soem/vcpkg.json
vendored
Executable file
14
externals/vcpkg/ports/soem/vcpkg.json
vendored
Executable file
@@ -0,0 +1,14 @@
|
||||
{
|
||||
"name": "soem",
|
||||
"version": "1.4.0",
|
||||
"port-version": 3,
|
||||
"description": "Simple Open Source EtherCAT Master",
|
||||
"homepage": "https://github.com/OpenEtherCATsociety/SOEM",
|
||||
"supports": "!uwp",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "winpcap",
|
||||
"platform": "windows"
|
||||
}
|
||||
]
|
||||
}
|
||||
23
externals/vcpkg/ports/soem/winpcap.patch
vendored
Executable file
23
externals/vcpkg/ports/soem/winpcap.patch
vendored
Executable file
@@ -0,0 +1,23 @@
|
||||
--- 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")
|
||||
Reference in New Issue
Block a user