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

Jump to bottom

Corrections to create relocatable CMake package (for linux and windows) #652

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

Corrections to create relocatable CMake package (for linux and windows) #652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a310c4b
.gitignore update
kutij Oct 17, 2022
fd30df1
Usage of target_link_libraries instead of link_libraries for system libs
kutij Oct 17, 2022
2d069eb
Unnecessary rows in target_include_directories commands
kutij Oct 17, 2022
ba3bcf5
CMake path in the package is unreasonably long
kutij Oct 17, 2022
0b81648
Variables used only once are substituted
kutij Oct 17, 2022
da54801
Usage of target_include_directories instead of include_directories
kutij Oct 17, 2022
e0432be
More versions of the libs (release/debug/Relwithdebinfo/minsizerel) c…
kutij Oct 17, 2022
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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@ install
/doc/latex
/doc/html
tags
cmake-build*
.idea/*
66 changes: 42 additions & 24 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_LIST_DIR}/install)
endif()

set(SOEM_INCLUDE_INSTALL_DIR include/soem)
set(SOEM_LIB_INSTALL_DIR lib)

if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
set(BUILD_TESTS TRUE)
else()
Expand All @@ -22,15 +19,38 @@ 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)
SET(OS_LIBS Ws2_32.lib Winmm.lib
\$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/oshw/win32/wpcap/Lib/x64/wpcap.lib>
\$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/oshw/win32/wpcap/Lib/x64/Packet.lib>
\$<INSTALL_INTERFACE:\$\{_IMPORT_PREFIX\}/lib/wpcap/x64/wpcap.lib>
\$<INSTALL_INTERFACE:\$\{_IMPORT_PREFIX\}/lib/wpcap/x64/Packet.lib>)
elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
link_directories(${CMAKE_CURRENT_LIST_DIR}/oshw/win32/wpcap/Lib)
SET(OS_LIBS Ws2_32.lib Winmm.lib
\$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/oshw/win32/wpcap/Lib/wpcap.lib>
\$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/oshw/win32/wpcap/Lib/Packet.lib>
\$<INSTALL_INTERFACE:\$\{_IMPORT_PREFIX\}/lib/wpcap/wpcap.lib>
\$<INSTALL_INTERFACE:\$\{_IMPORT_PREFIX\}/lib/wpcap/Packet.lib>)
endif()

set(OS_INCLUDE
\$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/oshw/win32/wpcap/Include>
\$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/oshw/win32/wpcap/Include/pcap>
\$<INSTALL_INTERFACE:include/wpcap/pcap>
\$<INSTALL_INTERFACE:include/wpcap>)

install(DIRECTORY "${CMAKE_SOURCE_DIR}/oshw/win32/wpcap/Include/"
DESTINATION "include/wpcap"
FILES_MATCHING
PATTERN "*.h")

install(DIRECTORY "${CMAKE_SOURCE_DIR}/oshw/win32/wpcap/Lib/"
DESTINATION "lib/wpcap"
FILES_MATCHING
PATTERN "*.lib")

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)
elseif(UNIX AND NOT APPLE)
set(OS "linux")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror")
Expand Down Expand Up @@ -74,36 +94,34 @@ add_library(soem STATIC
${OSAL_SOURCES}
${OSHW_SOURCES}
${OSHW_EXTRA_SOURCES})

if(WIN32)
SET(ADD_INFO -${CMAKE_VS_PLATFORM_TOOLSET}-${CMAKE_GENERATOR_PLATFORM}-${RUNTIME_INFO})
endif()
set_target_properties(soem PROPERTIES
RELEASE_POSTFIX "${ADD_INFO}"
RELWITHDEBINFO_POSTFIX "${ADD_INFO}-relwithdebinfo"
MINSIZEREL_POSTFIX "${ADD_INFO}-minsizerel"
DEBUG_POSTFIX "${ADD_INFO}-debug")

target_link_libraries(soem ${OS_LIBS})

target_include_directories(soem PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/soem>
$<INSTALL_INTERFACE:include/soem>)

target_include_directories(soem PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/osal>
$<INSTALL_INTERFACE:include/soem>)

target_include_directories(soem PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/osal/${OS}>
$<INSTALL_INTERFACE:include/soem>)

target_include_directories(soem
PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/oshw/${OS}>
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/oshw/${OS}>
$<INSTALL_INTERFACE:include/soem>
)

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

install(TARGETS soem EXPORT soemConfig DESTINATION ${SOEM_LIB_INSTALL_DIR})
${OS_INCLUDE})

install(EXPORT soemConfig DESTINATION share/soem/cmake)
install(TARGETS soem EXPORT soemConfig DESTINATION lib)
install(EXPORT soemConfig DESTINATION cmake)

install(FILES
${SOEM_HEADERS}
${OSAL_HEADERS}
${OSHW_HEADERS}
DESTINATION ${SOEM_INCLUDE_INSTALL_DIR})
DESTINATION include/soem)

if(BUILD_TESTS)
add_subdirectory(test/simple_ng)
Expand Down