Merge remote-tracking branch 'origin/1.4' into merge_14_master_9

jpfr · Dec 15, 2023 · 88f0398 · 88f0398
2 parents cc5c7da + fd10e43
commit 88f0398
Show file tree

Hide file tree

Showing 26 changed files with 1,103 additions and 1,866 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,9 +40,9 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 # number from the latest release plus the "-undefined" label. Will be
 # overwritten with more detailed information if git is available.
 set(OPEN62541_VER_MAJOR 1)
-set(OPEN62541_VER_MINOR 3)
-set(OPEN62541_VER_PATCH 8)
-set(OPEN62541_VER_LABEL "-undefined") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
+set(OPEN62541_VER_MINOR 4)
+set(OPEN62541_VER_PATCH 0)
+set(OPEN62541_VER_LABEL "-rc1") # like "-rc1" or "-g4538abcd" or "-g4538abcd-dirty"
 set(OPEN62541_VER_COMMIT "unknown-commit")
 
 # Overwrite the version information based on git if available

diff --git a/deps/nodesetLoader b/deps/nodesetLoader
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -110,16 +110,6 @@ if(UA_ENABLE_SUBSCRIPTIONS_EVENTS)
   endif()
 endif()
 
-##################
-# Example Server #
-##################
-
-add_example(server_ctt server_ctt.c)
-
-install(PROGRAMS $<TARGET_FILE:server_ctt>
-        DESTINATION bin
-        RENAME ua_server_ctt.exe)
-
 ##################
 # Example Client #
 ##################