Merge branch 'release-1.0.4'

Author: catharanthus

doc/changelog.txt

@@ -1,3 +1,11 @@
+========================
+SDM 1.0.4
+------------------------
+Released on 2022-02-08
+========================
+
+* sdk: ipsockets and uart libraries are now source-level (like pluginprovider) to make creating plugins using different compilers easier
+
 ========================
 SDM 1.0.3
 ------------------------

doc/manual.pdf

@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.3.0)
 
 set(PRODUCT_VERSION_MAJOR 1)
 set(PRODUCT_VERSION_MINOR 0)
-set(PRODUCT_VERSION_PATCH 3)
+set(PRODUCT_VERSION_PATCH 4)
 
 try_compile(CPU_DETECTED "${CMAKE_CURRENT_BINARY_DIR}/try_compile/DetectCPU" "${CMAKE_CURRENT_LIST_DIR}/DetectCPU.c" COPY_FILE "${CMAKE_CURRENT_BINARY_DIR}/try_compile/DetectCPU.bin")
 

src/cmake/Version.cmake

@@ -1,4 +1,4 @@
 % This file is automatically generated by the build system.
 % Do not edit it manually.
 
-\newcommand{\productversion}{1.0.3}
+\newcommand{\productversion}{1.0.4}

src/doc/manual/version.tex

@@ -1,25 +1,27 @@
 cmake_minimum_required(VERSION 3.3.0)
 
-add_library(ipsockets src/ipsocket.cpp)
+add_library(ipsockets INTERFACE)
 
-target_include_directories(ipsockets PUBLIC
+target_sources(ipsockets INTERFACE
+	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/ipsocket.cpp>
+	$<INSTALL_INTERFACE:${LIB_INSTALL_DIR}/sdk/ipsockets/ipsocket.cpp>)
+
+target_include_directories(ipsockets INTERFACE
 	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 	$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/sdk/ipsockets>)
 
 if(WIN32)
-	target_link_libraries(ipsockets ws2_32 iphlpapi)
+	target_link_libraries(ipsockets INTERFACE ws2_32 iphlpapi)
 endif()
 
-set_target_properties(ipsockets PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
-
 ###########################
 # INSTALL
 ###########################
 
-install(TARGETS ipsockets
-	EXPORT sdm
-	LIBRARY DESTINATION "${LIB_INSTALL_DIR}/sdk"
-	ARCHIVE DESTINATION "${LIB_INSTALL_DIR}/sdk")
+install(TARGETS ipsockets EXPORT sdm)
 
 install(DIRECTORY include/
 	DESTINATION "${INCLUDE_INSTALL_DIR}/sdk/ipsockets")
+
+install(DIRECTORY src/
+	DESTINATION "${LIB_INSTALL_DIR}/sdk/ipsockets")

src/sdk/lib/ipsockets/CMakeLists.txt

@@ -1,31 +1,33 @@
 cmake_minimum_required(VERSION 3.3.0)
 
-set(UART_SRC src/uart.cpp)
+add_library(uart INTERFACE)
+
+target_sources(uart INTERFACE
+	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/uart.cpp>
+	$<INSTALL_INTERFACE:${LIB_INSTALL_DIR}/sdk/uart/uart.cpp>)
 
 if(WIN32)
-	list(APPEND UART_SRC src/win32/uartimpl.cpp)
+	target_sources(uart INTERFACE
+		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/win32/uartimpl.cpp>
+		$<INSTALL_INTERFACE:${LIB_INSTALL_DIR}/sdk/uart/win32/uartimpl.cpp>)
 else()
-	list(APPEND UART_SRC src/posix/uartimpl.cpp)
+	target_sources(uart INTERFACE
+		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src/posix/uartimpl.cpp>
+		$<INSTALL_INTERFACE:${LIB_INSTALL_DIR}/sdk/uart/posix/uartimpl.cpp>)
 endif()
 
-add_library(uart ${UART_SRC})
-
-target_include_directories(uart PUBLIC
+target_include_directories(uart INTERFACE
 	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 	$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/sdk/uart>)
 
-target_include_directories(uart PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)
-
-set_target_properties(uart PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
-
 ###########################
 # INSTALL
 ###########################
 
-install(TARGETS uart
-	EXPORT sdm
-	LIBRARY DESTINATION "${LIB_INSTALL_DIR}/sdk"
-	ARCHIVE DESTINATION "${LIB_INSTALL_DIR}/sdk")
+install(TARGETS uart EXPORT sdm)
 
 install(DIRECTORY include/
 	DESTINATION "${INCLUDE_INSTALL_DIR}/sdk/uart")
+
+install(DIRECTORY src/
+	DESTINATION "${LIB_INSTALL_DIR}/sdk/uart")