Skip to content
GitLab
Commit 18aee4be authored by Christian Hitz's avatar Christian Hitz
Browse files

Merge branch 'release-0.9.3' into testing

parents c215c590 c4353376
master MR_broadcast_confirmed MR_bugfix_broadcast_wakes_unicast MR_debug-broadcast-confirm MR_dump_1st_broadcast_confirmation MR_emit_bus_lost_event MR_rate_limit R1.7 R1.8 R1.9 R1501 R1511 R1902 R1904 R1906 R1908 R1911 R2002 R2004 R2006 R2008 R2011 R2102 R2106 R2111 R2204 R2207 R2210 R2303 R2309 R2311 R2411 exhibition improve_pipeline old_testing production testing 1.19.11 1.19.11-beta01 1.19.10.1 1.19.10.1-beta01 1.19.10 1.19.9 1.19.9-beta03 1.19.9-beta02 1.19.9-beta01 1.19.8.1 1.19.8 1.19.8-beta03 1.19.8-beta02 1.19.8-beta01 1.19.7.1 1.19.7 1.19.7-beta07 1.19.7-beta06 1.19.7-beta05 1.19.7-beta04 1.19.7-beta03 1.19.7-beta02 1.19.7-beta01 1.19.6.3 1.19.6.2 1.19.6.1 1.19.6.1-beta01 1.19.6 1.19.6-beta03 1.19.6-beta02 1.19.6-beta01 1.19.5.1 1.19.5.1-beta02 1.19.5.1-beta01 1.19.5 1.19.5-beta03 1.19.5-beta02 1.19.5-beta01 1.19.4 1.19.4-beta04 1.19.4-beta03 1.19.4-beta02 1.19.4-beta01 1.19.3.1 1.19.3.1-beta01 1.19.3 1.19.3-beta06 1.19.3-beta05 1.19.3-beta04 1.19.3-beta03 1.19.3-beta02 1.19.3-beta01 1.19.2.1 1.19.2 1.19.2-beta02 1.19.2-beta01 1.19.1 1.19.1-beta02 1.19.1-beta01 1.19.0 1.19.0-beta03 1.19.0-beta02 1.19.0-beta01 1.18.0 1.18.0-beta04 1.18.0-beta03 1.18.0-beta02 1.18.0-beta01 1.17.0 1.17.0-beta05 1.17.0-beta04 1.17.0-beta03 1.17.0-beta02 1.17.0-beta01 1.16.7 1.16.7-beta04 1.16.7-beta03 1.16.7-beta02 1.16.7-beta01 1.16.6.1 1.16.6.1-beta01 1.16.6 1.16.6-beta04 1.16.6-beta03 1.16.6-beta02 1.16.6-beta01 1.16.5 1.16.5-beta07 1.16.5-beta06 1.16.5-beta05 1.16.5-beta04 1.16.5-beta03 1.16.5-beta02 1.16.5-beta01 1.16.4 1.16.4-beta06 1.16.4-beta05 1.16.4-beta04 1.16.4-beta03 1.16.4-beta02 1.16.4-beta01 1.16.3 1.16.3-beta08 1.16.3-beta07 1.16.3-beta06 1.16.3-beta05 1.16.3-beta04 1.16.3-beta03 1.16.3-beta02 1.16.3-beta01 1.16.2.1 1.16.2.1-beta01 1.16.2 1.16.2-beta07 1.16.2-beta06 1.16.2-beta05 1.16.2-beta04 1.16.2-beta03 1.16.2-beta02 1.16.2-beta01 1.16.1.1 1.16.1 1.16.1-beta05 1.16.1-beta04 1.16.1-beta03 1.16.1-beta02 1.16.1-beta01 v1.5.4 v1.5.3 v1.5.2 v1.5.1 v1.5.0 v1.3.4 v1.3.3 v1.3.2 v1.3.1 v1.3.0 v1.2.7 v1.2.6 v1.2.5 v1.2.4 v1.2.3 v1.2.2 v1.2.1 v1.2.0 v1.1.2 v1.1.1 v1.1.0 v1.0.0.2 v1.0.0.1 v1.0.0 v0.9.4 v0.9.3
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 3 deletions
+3 -3
CMakeLists.txt
+ 1
− 1
View file @ 18aee4be
cmake_minimum_required(VERSION 2.6)
project(ds485-client)
set(VERSION 0.9.0)
set(VERSION 0.9.3)
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake_modules)
if(NOT CMAKE_BUILD_TYPE)
......
src/CMakeLists.txt
+ 2
− 2
View file @ 18aee4be
......@@ -36,8 +36,8 @@ if (UNIX)
target_link_libraries(ds485-client-v1 pthread)
endif (WITH_GPL)
set_target_properties(ds485-client PROPERTIES VERSION 1.0.0)
set_target_properties(ds485-client-v1 PROPERTIES VERSION 1.0.0)
set_target_properties(ds485-client PROPERTIES VERSION 1.0.0 SOVERSION 1)
set_target_properties(ds485-client-v1 PROPERTIES VERSION 1.0.0 SOVERSION 1)
elseif (WIN32)
endif (UNIX)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment