Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix link directory error when using SOEM with cmake fetch_content #786

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix link directory error when using SOEM with cmake fetch_content #786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c89908a
update
limymy Feb 6, 2024
a5c46fd
fix fetch_content
limymy Feb 6, 2024
667283a
delete old file
limymy Apr 28, 2024
5a888fb
Merge branch 'OpenEtherCATsociety:master' into master
limymy Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ endif()

if(WIN32)
set(OS "win32")
include_directories(oshw/win32/wpcap/Include)
set(EXTERNAL_LIB_INC_PATH ${CMAKE_CURRENT_LIST_DIR}/oshw/win32/wpcap/Include)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
link_directories(${CMAKE_CURRENT_LIST_DIR}/oshw/win32/wpcap/Lib/x64)
set(EXTERNAL_LIB_PATH ${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)
set(EXTERNAL_LIB_PATH ${CMAKE_CURRENT_LIST_DIR}/oshw/win32/wpcap/Lib)
endif()
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 ${EXTERNAL_LIB_PATH}/wpcap.lib ${EXTERNAL_LIB_PATH}/Packet.lib Ws2_32.lib Winmm.lib)
elseif(UNIX AND NOT APPLE)
set(OS "linux")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
Expand Down Expand Up @@ -93,6 +93,9 @@ target_include_directories(soem
$<INSTALL_INTERFACE:include/soem>
)

target_include_directories(soem PUBLIC
$<BUILD_INTERFACE:${EXTERNAL_LIB_INC_PATH}>)

message(STATUS "LIB_DIR: ${SOEM_LIB_INSTALL_DIR}")

install(TARGETS soem EXPORT soemConfig DESTINATION ${SOEM_LIB_INSTALL_DIR})
Expand Down
247 changes: 0 additions & 247 deletions osal/win32/stdint.h
View file
Open in desktop

This file was deleted.