Merge pull request #9 from NikolasK-source/main

Release v1.1.1

Author: NikolasK-source

CMakeLists.txt

@@ -4,10 +4,10 @@ cmake_minimum_required(VERSION 3.13.4 FATAL_ERROR)
 # ======================================================================================================================
 
 # project
-project(Modbus_TCP_client_shm LANGUAGES CXX VERSION 1.1.0)
+project(Modbus_TCP_client_shm LANGUAGES CXX VERSION 1.1.1)
 
 # settings
-set(Target "Modbus_TCP_client_shm")    # Executable name (without file extension!)
+set(Target "modbus-tcp-client-shm")    # Executable name (without file extension!)
 set(STANDARD 17)                  # C++ Standard
 set(ARCHITECTURE "native")        # CPU architecture to optimize for (only relevant if OPTIMIZE_FOR_ARCHITECTURE is ON)
 
@@ -41,6 +41,7 @@ endif()
 
 # add executable
 add_executable(${Target})
+install(TARGETS ${Target})
 
 # set source and libraries directory
 add_subdirectory("src")
@@ -53,9 +54,12 @@ set_target_properties(${Target} PROPERTIES
         CXX_EXTENSIONS ${COMPILER_EXTENSIONS}
     )
 
-# project version and name
+# compiler definitions
 target_compile_definitions(${Target} PUBLIC "PROJECT_VERSION=\"${CMAKE_PROJECT_VERSION}\"")
 target_compile_definitions(${Target} PUBLIC "PROJECT_NAME=\"${CMAKE_PROJECT_NAME}\"")
+target_compile_definitions(${Target} PUBLIC "COMPILER_INFO=\"${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}\"")
+target_compile_definitions(${Target} PUBLIC "SYSTEM_INFO=\"${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_VERSION} ${CMAKE_HOST_SYSTEM_PROCESSOR}\"")
+
 
 # options that are valid for gcc and clang
 function(commonopts)
@@ -177,7 +181,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         clangwarn()
     else()
         target_compile_options(${Target} PUBLIC -w)
-    endif()
+endif()
 
 elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
     # compiler specific defines

network.koesling.modbus-tcp-client-shm.yml

@@ -2,7 +2,7 @@ id: network.koesling.modbus-tcp-client-shm
 runtime: org.freedesktop.Platform
 runtime-version: '21.08'
 sdk: org.freedesktop.Sdk
-command: Modbus_TCP_client_shm
+command: modbus-tcp-client-shm
 finish-args:
   - --device=shm
   - --share=network
@@ -16,9 +16,7 @@ modules:
     - cmake --build build
 
     # install
-    - mkdir -p "${FLATPAK_DEST}/bin"
-    - cp build/Modbus_TCP_client_shm ${FLATPAK_DEST}/bin
-    - ls -lah ${FLATPAK_DEST}
+    - install -D -m 755 -t ${FLATPAK_DEST}/bin build/modbus-tcp-client-shm
     sources:
       - type: git
         branch: release

network.koesling.test-modbus-tcp-client-shm.yml

@@ -2,7 +2,7 @@ id: network.koesling.test-modbus-tcp-client-shm
 runtime: org.freedesktop.Platform
 runtime-version: '21.08'
 sdk: org.freedesktop.Sdk
-command: Modbus_TCP_client_shm
+command: modbus-tcp-client-shm
 finish-args:
   - --device=shm
   - --share=network
@@ -16,9 +16,7 @@ modules:
     - cmake --build build
 
     # install
-    - mkdir -p "${FLATPAK_DEST}/bin"
-    - cp build/Modbus_TCP_client_shm ${FLATPAK_DEST}/bin
-    - ls -lah ${FLATPAK_DEST}
+    - install -D -m 755 -t ${FLATPAK_DEST}/bin build/modbus-tcp-client-shm
     sources:
       - type: dir
         path: .

src/main.cpp

@@ -165,7 +165,8 @@ int main(int argc, char **argv) {
 
     // print usage
     if (args.count("version")) {
-        std::cout << PROJECT_NAME << ' ' << PROJECT_VERSION
+        std::cout << PROJECT_NAME << ' ' << PROJECT_VERSION << " (compiled with " << COMPILER_INFO << " on "
+                  << SYSTEM_INFO << ')'
 #ifndef OS_LINUX
                   << "-nonlinux"
 #endif