Skip to content

Commit 006f954

Browse files
committed
sdk: make ipsockets and uart source-level (interface) libraries to make using different compilers easier
1 parent 4b7dc8d commit 006f954

File tree

3 files changed

+27
-23
lines changed

3 files changed

+27
-23
lines changed
Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,27 @@
11
cmake_minimum_required(VERSION 3.3.0)
22

3-
add_library(ipsockets src/ipsocket.cpp)
3+
add_library(ipsockets INTERFACE)
44

5-
target_include_directories(ipsockets PUBLIC
5+
target_sources(ipsockets INTERFACE
6+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/ipsocket.cpp>
7+
$<INSTALL_INTERFACE:${LIB_INSTALL_DIR}/sdk/ipsockets/ipsocket.cpp>)
8+
9+
target_include_directories(ipsockets INTERFACE
610
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
711
$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/sdk/ipsockets>)
812

913
if(WIN32)
10-
target_link_libraries(ipsockets ws2_32 iphlpapi)
14+
target_link_libraries(ipsockets INTERFACE ws2_32 iphlpapi)
1115
endif()
1216

13-
set_target_properties(ipsockets PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
14-
1517
###########################
1618
# INSTALL
1719
###########################
1820

19-
install(TARGETS ipsockets
20-
EXPORT sdm
21-
LIBRARY DESTINATION "${LIB_INSTALL_DIR}/sdk"
22-
ARCHIVE DESTINATION "${LIB_INSTALL_DIR}/sdk")
21+
install(TARGETS ipsockets EXPORT sdm)
2322

2423
install(DIRECTORY include/
2524
DESTINATION "${INCLUDE_INSTALL_DIR}/sdk/ipsockets")
25+
26+
install(DIRECTORY src/
27+
DESTINATION "${LIB_INSTALL_DIR}/sdk/ipsockets")

src/sdk/lib/uart/CMakeLists.txt

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,33 @@
11
cmake_minimum_required(VERSION 3.3.0)
22

3-
set(UART_SRC src/uart.cpp)
3+
add_library(uart INTERFACE)
4+
5+
target_sources(uart INTERFACE
6+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/uart.cpp>
7+
$<INSTALL_INTERFACE:${LIB_INSTALL_DIR}/sdk/uart/uart.cpp>)
48

59
if(WIN32)
6-
list(APPEND UART_SRC src/win32/uartimpl.cpp)
10+
target_sources(uart INTERFACE
11+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/win32/uartimpl.cpp>
12+
$<INSTALL_INTERFACE:${LIB_INSTALL_DIR}/sdk/uart/win32/uartimpl.cpp>)
713
else()
8-
list(APPEND UART_SRC src/posix/uartimpl.cpp)
14+
target_sources(uart INTERFACE
15+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/posix/uartimpl.cpp>
16+
$<INSTALL_INTERFACE:${LIB_INSTALL_DIR}/sdk/uart/posix/uartimpl.cpp>)
917
endif()
1018

11-
add_library(uart ${UART_SRC})
12-
13-
target_include_directories(uart PUBLIC
19+
target_include_directories(uart INTERFACE
1420
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
1521
$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/sdk/uart>)
1622

17-
target_include_directories(uart PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
18-
19-
set_target_properties(uart PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
20-
2123
###########################
2224
# INSTALL
2325
###########################
2426

25-
install(TARGETS uart
26-
EXPORT sdm
27-
LIBRARY DESTINATION "${LIB_INSTALL_DIR}/sdk"
28-
ARCHIVE DESTINATION "${LIB_INSTALL_DIR}/sdk")
27+
install(TARGETS uart EXPORT sdm)
2928

3029
install(DIRECTORY include/
3130
DESTINATION "${INCLUDE_INSTALL_DIR}/sdk/uart")
31+
32+
install(DIRECTORY src/
33+
DESTINATION "${LIB_INSTALL_DIR}/sdk/uart")
File renamed without changes.

0 commit comments

Comments
 (0)