Merge branch 'dev'

Author: gershnik

.github/workflows/build.yml

@@ -105,7 +105,7 @@ jobs:
     - name: Build
       run: |
           cmake -E make_directory out
-          cmake -S . -B out -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFETCHCONTENT_QUIET=OFF 
+          cmake -S . -B out -DCMAKE_BUILD_TYPE=RelWithDebInfo "-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64" -DFETCHCONTENT_QUIET=OFF 
           installers/${{ matrix.installer }}/build.py . out
 
 

.github/workflows/publish.yml

@@ -111,7 +111,7 @@ jobs:
       run: |
           cmake -E make_directory out
           cd out
-          cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFETCHCONTENT_QUIET=OFF ..
+          cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo "-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64" -DFETCHCONTENT_QUIET=OFF ..
           
 
     - name: Make Distribution

CHANGELOG.md

@@ -5,6 +5,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## Unreleased
 
+### Fixed
+- APT installer no longer creates bogus `/debian` directory
+- Mac `.pkg` installer now correctly includes both x64 and arm64 architectures.
+
+### Changed
+- Updated `{fmt}` library dependency 
+- It is now possible to specify version externally when building `wsddn` by setting `WSDDN_VERSION` CMake variable.
+
 ## [1.1] - 2023-05-19
 
 ### Added

CMakeLists.txt

@@ -66,6 +66,7 @@ if (TARGET uuid_static)
     set_target_properties(uuid_static PROPERTIES FOLDER "Dependencies")
 endif()
 set_target_properties(spdlog PROPERTIES FOLDER "Dependencies")
+set_target_properties(fmt PROPERTIES FOLDER "Dependencies")
 
 
 set_target_properties(wsddn PROPERTIES
@@ -192,18 +193,22 @@ PRIVATE
     ${CMAKE_SOURCES}
 )
 
-execute_process(
-    COMMAND git describe --tags --match "v*" --abbrev=0
-    WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
-    RESULT_VARIABLE GIT_DESCRIBE_RESULT
-    OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
-)
+if (NOT WSDDN_VERSION)
+
+    execute_process(
+        COMMAND git describe --tags --match "v*" --abbrev=0
+        WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+        RESULT_VARIABLE GIT_DESCRIBE_RESULT
+        OUTPUT_VARIABLE GIT_DESCRIBE_OUTPUT
+    )
+
+    if ("${GIT_DESCRIBE_RESULT}" STREQUAL "0")
+        string(STRIP "${GIT_DESCRIBE_OUTPUT}" GIT_DESCRIBE_OUTPUT)
+        string(SUBSTRING "${GIT_DESCRIBE_OUTPUT}" 1 -1 WSDDN_VERSION)
+    else()
+        set(WSDDN_VERSION "0.1")
+    endif()
 
-if ("${GIT_DESCRIBE_RESULT}" STREQUAL "0")
-    string(STRIP "${GIT_DESCRIBE_OUTPUT}" GIT_DESCRIBE_OUTPUT)
-    string(SUBSTRING "${GIT_DESCRIBE_OUTPUT}" 1 -1 WSDDN_VERSION)
-else()
-    set(WSDDN_VERSION "0.1")
 endif()
 
 message(NOTICE WSDDN_VERSION: ${WSDDN_VERSION})

cmake/dependencies.cmake

@@ -63,14 +63,26 @@ endif()
 
 FetchContent_Declare(libuuid
     GIT_REPOSITORY  https://github.com/gershnik/libuuid-cmake.git
-    GIT_TAG         v2.39
+    GIT_TAG         v2.39.rev1
     GIT_SHALLOW     TRUE
     GIT_PROGRESS    TRUE
 )
 list(APPEND DECLARED_DEPENDENCIES libuuid)
 
+set(FMT_INSTALL OFF)
+
+FetchContent_Declare(fmt
+    GIT_REPOSITORY  https://github.com/fmtlib/fmt
+    GIT_TAG         9.1.0
+    GIT_SHALLOW     TRUE
+    GIT_PROGRESS    TRUE
+    GIT_SUBMODULES_RECURSE FALSE
+)
+list(APPEND DECLARED_DEPENDENCIES fmt)
+
 set(SPDLOG_NO_ATOMIC_LEVELS ON)
 set(SPDLOG_NO_TLS ON)
+set(SPDLOG_FMT_EXTERNAL_HO ON)
 
 FetchContent_Declare(spdlog
     GIT_REPOSITORY  https://github.com/gabime/spdlog

installers/deb-systemd/build.py

@@ -82,6 +82,8 @@
 key, val = deps.split('=', 1)
 key = key.replace(':', "_")
 control.write_text(control.read_text().format_map({key: val}))
+
+(stagedir/ 'debian').unlink()
 subprocess.run(['dpkg-deb', '--build', '--root-owner-group', stagedir, workdir], check=True)
 
 subprocess.run(['gzip', '--keep', '--force', builddir / 'wsddn'], check=True)