Merge pull request #26 from NikolasK-source/main

Release 1.3.1

Author: NikolasK-source

CMakeLists.txt

@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13.4 FATAL_ERROR)
 # ======================================================================================================================
 
 # project
-project(Modbus_TCP_client_shm LANGUAGES CXX VERSION 1.3.0)
+project(Modbus_TCP_client_shm LANGUAGES CXX VERSION 1.3.1)
 
 # settings
 set(Target "modbus-tcp-client-shm")    # Executable name (without file extension!)

README.md

@@ -38,7 +38,7 @@ modbus-tcp-client-shm [OPTION...]
       --force                 Force the use of the shared memory even if it already exists. Do not use this option per 
                               default! It should only be used if the shared memory of an improperly terminated instance 
                               continues to exist as an orphan and is no longer used.
-  -s, --separate arg          Use a separate shared memory for requests with the specified client id. The the client id 
+  -s, --separate arg          Use a separate shared memory for requests with the specified client id. The client id 
                               (as hex value) is appended to the shared memory prefix (e.g. modbus_fc_DO). You can 
                               specify multiple client ids by separating them with ','. Use --separate-all to generate 
                               separate shared memories for all possible client ids.

modbus.cmake

@@ -16,10 +16,10 @@ ExternalProject_Add(
         libmodbus
         PREFIX ${MODBUS_BIN}
         SOURCE_DIR ${MODBUS_DIR}
-        DOWNLOAD_COMMAND cd ${MODBUS_DIR} && git clean -dfX && ${MODBUS_DIR}/autogen.sh
-        CONFIGURE_COMMAND ${MODBUS_DIR}/configure --srcdir=${MODBUS_DIR} --prefix=${MODBUS_BIN} --enable-static=yes --disable-shared
-        BUILD_COMMAND make
-        INSTALL_COMMAND make install
+        DOWNLOAD_COMMAND cd ${MODBUS_DIR} && git clean -dfX
+        CONFIGURE_COMMAND cd ${MODBUS_DIR} && git clean -dfX && ${MODBUS_DIR}/autogen.sh && ${MODBUS_DIR}/configure --srcdir=${MODBUS_DIR} --prefix=${MODBUS_BIN} --enable-static=yes --disable-shared
+        BUILD_COMMAND cd ${MODBUS_DIR} && make
+        INSTALL_COMMAND cd ${MODBUS_DIR} && make install
         BUILD_BYPRODUCTS ${MODBUS_STATIC_LIB}
 )
 

src/main.cpp

@@ -164,7 +164,7 @@ int main(int argc, char **argv) {
                           "to exist as an orphan and is no longer used.")
                          ("s,separate",
                           "Use a separate shared memory for requests with the specified client id. "
-                          "The the client id (as hex value) is appended to the shared memory prefix (e.g. modbus_fc_DO)"
+                          "The client id (as hex value) is appended to the shared memory prefix (e.g. modbus_fc_DO)"
                           ". You can specify multiple client ids by separating them with ','. "
                           "Use --separate-all to generate separate shared memories for all possible client ids.",
                           cxxopts::value<std::vector<std::uint8_t>>())