[*] Some fixes

CMakeLists.txt

@@ -43,36 +43,33 @@ endif()
 set(CMAKE_VERBOSE_MAKEFILE ON)
 set(CMAKE_COLOR_MAKEFILE   ON)
 set(CMAKE_CXX_STANDARD 11)
-
-SET(CMAKE_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
-SET(CPACK_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
-SET(DESTDIR "/opt/${PROJECT_NAME}")
-
-SET( CPACK_GENERATOR "DEB")
-SET( CPACK_PACKAGE_NAME  "${PROJECT_NAME}")
-SET( CPACK_PACKAGE_VERSION_MAJOR 1)
-SET( CPACK_PACKAGE_VERSION_MINOR 1)
-SET( CPACK_PACKAGE_VERSION_PATCH 2)
-
-SET( CPACK_SYSTEM_NAME "debian-10.0-amd64")
-SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}")
-SET( CPACK_DEBIAN_PACKAGE_MAINTAINER "Dmitriy Gerasimov <naeper@demlabs.net>" )
-SET( CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY "DapCash Node software https://dapcash.org" )
-SET( CPACK_DEBIAN_PACKAGE_DESCRIPTION   "DapCash Node" )
-SET( CPACK_DEBIAN_PACKAGE_SECTION "extra")
-SET( CPACK_DEBIAN_PACKAGE_DEPENDS "debconf (>=1.5), dpkg (>=1.17), bash (>=4), debconf-utils, dconf-cli, less, pv, psmisc, procps")
-SET( CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-SET( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA
-    "${CMAKE_CURRENT_SOURCE_DIR}/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/debian/postrm;${CMAKE_CURRENT_SOURCE_DIR}/debian/templates;${CMAKE_CURRENT_SOURCE_DIR}/debian/config;")
-
-set(CMAKE_VERBOSE_MAKEFILE ON)
-set(CMAKE_COLOR_MAKEFILE   ON)
 set(CMAKE_C_STANDARD 11)
 set(SUBMODULES_NO_BUILD ON)
 
-add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"")
-add_definitions ("-DDAP_SERVER -DDAP_LOG_MT")
-add_definitions ("-DNODE_NETNAME=\"dapcash\"")
+if (LINUX)
+    SET(CMAKE_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
+    SET(CPACK_INSTALL_PREFIX "/opt/${PROJECT_NAME}")
+    SET(DESTDIR "/opt/${PROJECT_NAME}")
+
+    SET( CPACK_GENERATOR "DEB")
+    SET( CPACK_PACKAGE_NAME  "${PROJECT_NAME}")
+    SET( CPACK_PACKAGE_VERSION_MAJOR 1)
+    SET( CPACK_PACKAGE_VERSION_MINOR 1)
+    SET( CPACK_PACKAGE_VERSION_PATCH 3)
+
+    SET( CPACK_SYSTEM_NAME "debian-${DEBIAN_OS_NAME}-amd64")
+    SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}")
+    SET( CPACK_DEBIAN_PACKAGE_MAINTAINER "Dmitriy Gerasimov <naeper@demlabs.net>" )
+    SET( CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY "DapCash Node software https://dapcash.org" )
+    SET( CPACK_DEBIAN_PACKAGE_DESCRIPTION   "DapCash Node" )
+    SET( CPACK_DEBIAN_PACKAGE_SECTION "extra")
+    SET( CPACK_DEBIAN_PACKAGE_DEPENDS "debconf (>=1.5), dpkg (>=1.17), bash (>=4), debconf-utils, dconf-cli, less, pv, psmisc, procps")
+    SET( CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+    SET( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/debian/postrm;${CMAKE_CURRENT_SOURCE_DIR}/debian/templates;${CMAKE_CURRENT_SOURCE_DIR}/debian/config;")
+
+    add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}\"")
+    add_definitions ("-DDAP_SERVER -DDAP_LOG_MT")
+endif()
 
 if(WIN32)
 

cmake/OS_Detection.cmake

@@ -2,6 +2,8 @@
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     set(LINUX 1)
 
+    EXECUTE_PROCESS( COMMAND cat /etc/os-release COMMAND grep VERSION_CODENAME COMMAND sed s/VERSION_CODENAME=// COMMAND tr -d '\n' OUTPUT_VARIABLE L_DEBIAN_OS_NAME)
+    SET(DEBIAN_OS_NAME "${L_DEBIAN_OS_NAME}")
 # check if we're building natively on Android (TERMUX)
     EXECUTE_PROCESS( COMMAND uname -o COMMAND tr -d '\n' OUTPUT_VARIABLE OPERATING_SYSTEM)
       if(${OPERATING_SYSTEM} MATCHES "Android")

libdap-client @ 1b752f98

-Subproject commit e1e44eac7b182425f3df380d116d0a4ee461ae41
+Subproject commit 1b752f986801d728e3d3ea7506750895791b2793