From 93fcfbb6000ff1d92432a93c25ffa52565ec095b Mon Sep 17 00:00:00 2001
From: Rainer Leuschke <rainer@uw.edu>
Date: Thu, 4 May 2023 12:28:33 -0700
Subject: [PATCH 1/2] update for regenerated IDLs; version bump

---
 CMakeLists.txt      |  8 +++++---
 cmake/Packing.cmake | 37 +++++++++++++++++++++++++++++++++++++
 src/main.cpp        |  3 ++-
 3 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 cmake/Packing.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e9682f..ff48f1e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,9 +9,9 @@ project("MoHSES_Simple_Assessment_Module")
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
 set(VERSION_TYPE "beta" CACHE STRING "version type" FORCE)
-set(PROJECT_VERSION_MAJOR, 1)
-set(PROJECT_VERSION_MINOR, 1)
-set(PROJECT_VERSION_PATCH@, 1)
+set(PROJECT_VERSION_MAJOR 1)
+set(PROJECT_VERSION_MINOR 2)
+set(PROJECT_VERSION_PATCH 0)
 site_name(VERSION_HOST) # read hostname to VERSION_HOST
 set(VERSION_HOST "${VERSION_HOST}" CACHE STRING "host of build" FORCE)
 
@@ -71,3 +71,5 @@ message(STATUS "Output:               ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
 message(STATUS "Compiler:             ${CMAKE_CXX_COMPILER}")
 message(STATUS "CMAKE_BUILD_TYPE:     ${CMAKE_BUILD_TYPE}")
 message(STATUS "")
+
+include(Packing)
diff --git a/cmake/Packing.cmake b/cmake/Packing.cmake
new file mode 100644
index 0000000..9411c48
--- /dev/null
+++ b/cmake/Packing.cmake
@@ -0,0 +1,37 @@
+# these are cache variables, so they could be overwritten with -D,
+set(CPACK_PACKAGE_NAME ${PROJECT_NAME}
+    CACHE STRING "The resulting package name"
+)
+# which is useful in case of packing only selected components instead of the whole thing
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Package for ${PROJECT_NAME} module"
+    CACHE STRING "Package description for the package metadata"
+)
+set(CPACK_PACKAGE_VENDOR "")
+
+set(CPACK_VERBATIM_VARIABLES YES)
+
+#set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
+#SET(CPACK_OUTPUT_FILE_PREFIX "${CMAKE_SOURCE_DIR}/_packages")
+
+# https://unix.stackexchange.com/a/11552/254512
+set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/local")
+
+set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
+
+set(CPACK_PACKAGE_CONTACT "")
+set(CPACK_DEBIAN_PACKAGE_MAINTAINER "<${CPACK_PACKAGE_CONTACT}>")
+
+#set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md")
+set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
+
+# package name for deb
+# if set, then instead of some-application-0.9.2-Linux.deb
+# you'll get some-application_0.9.2_amd64.deb (note the underscores too)
+set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
+
+# list dependencies
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS YES)
+
+include(CPack)
diff --git a/src/main.cpp b/src/main.cpp
index eec91b3..82457f1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -272,7 +272,8 @@ void on_command(AMM::Command &command, SampleInfo_t *info) {
 void on_module_configuration(AMM::ModuleConfiguration &mc, SampleInfo_t *info) {
     if (mc.name() == "simple_assessment") {
         LOG_TRACE << "Module config received, MC name is " << mc.name();
-        parse_xml(mc.capabilities_configuration());
+        std::string capabilities = mc.capabilities_configuration().to_string();
+        parse_xml(capabilities);
     }
 }
 

From 182fae2f8493e6bda34d57cf5209041c21dabbf3 Mon Sep 17 00:00:00 2001
From: Rainer Leuschke <rainer@uw.edu>
Date: Fri, 26 May 2023 14:27:46 -0700
Subject: [PATCH 2/2] quiet compiler abi change notes

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff48f1e..e8b4e28 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,6 +53,7 @@ if (MSVC)
 else ()
     add_compile_options(-std=c++14)
     add_compile_options(-O0)
+    add_compile_options(-Wno-psabi)
 endif ()
 
 find_package(amm_std REQUIRED)