diff --git a/.gitea/workflows/docker-rh8-build-test.yml b/.gitea/workflows/docker-rh8-build-test.yml index 02ed77211..5959f3a0d 100644 --- a/.gitea/workflows/docker-rh8-build-test.yml +++ b/.gitea/workflows/docker-rh8-build-test.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Clone repository run: | - git lfs install + git lfs install --skip-smudge echo Cloning ${{ github.ref_name }} git clone https://${{secrets.GITHUB_TOKEN}}@gitea.psi.ch/${{ github.repository }}.git --branch=${{ github.ref_name }} . diff --git a/slsDetectorServers/matterhornServer/include/MatterhornServerImpl.hpp b/slsDetectorServers/matterhornServer/include/MatterhornServerImpl.hpp index a750a59c5..5e9258b93 100644 --- a/slsDetectorServers/matterhornServer/include/MatterhornServerImpl.hpp +++ b/slsDetectorServers/matterhornServer/include/MatterhornServerImpl.hpp @@ -20,9 +20,7 @@ class MatterhornServerImpl void set_module_position_and_update_srcudpmac( const std::array &position_info); - void - set_source_udp_mac([[maybe_unused]] const uint64_t - src_mac); // TODO: doesnt it need to receive src_mac? + void set_source_udp_mac([[maybe_unused]] const uint64_t src_mac); }; } // end namespace sls \ No newline at end of file diff --git a/slsDetectorServers/slsDetectorServer_cpp/CMakeLists.txt b/slsDetectorServers/slsDetectorServer_cpp/CMakeLists.txt index 7adeb43b9..3136c35aa 100644 --- a/slsDetectorServers/slsDetectorServer_cpp/CMakeLists.txt +++ b/slsDetectorServers/slsDetectorServer_cpp/CMakeLists.txt @@ -31,7 +31,7 @@ set(PUBLICHEADERS #Shared library if(SLS_BUILD_SHARED_LIBRARIES) add_library(slsServerShared SHARED $) - target_link_libraries(slsServerShared PUBLIC slsServerObject) + target_link_libraries(slsServerShared PUBLIC slsServerObject PRIVATE slsProjectWarnings) set_target_properties(slsServerShared PROPERTIES VERSION ${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH} SOVERSION ${PACKAGE_VERSION_MAJOR} @@ -44,7 +44,7 @@ endif(SLS_BUILD_SHARED_LIBRARIES) #Static library add_library(slsServerStatic STATIC $) -target_link_libraries(slsServerStatic PUBLIC slsServerObject) +target_link_libraries(slsServerStatic PUBLIC slsServerObject PRIVATE slsProjectWarnings) set_target_properties(slsServerStatic PROPERTIES ARCHIVE_OUTPUT_NAME SlsServerStatic diff --git a/slsDetectorServers/slsDetectorServer_cpp/include/MemoryModel.hpp b/slsDetectorServers/slsDetectorServer_cpp/include/MemoryModel.hpp index 0c04d1b3f..8acc16a4e 100644 --- a/slsDetectorServers/slsDetectorServer_cpp/include/MemoryModel.hpp +++ b/slsDetectorServers/slsDetectorServer_cpp/include/MemoryModel.hpp @@ -40,9 +40,11 @@ template class VirtualMemoryModel { public: // IPcore_base_address is not used for virtual memory model but kept for // compatibility with HardwareMemoryModel interface - VirtualMemoryModel([[maybe_unused]] const uint32_t IPcore_base_address, + VirtualMemoryModel(const uint32_t IPcore_base_address, const size_t size_memory_space_) - : size_memory_space(size_memory_space_) {} + : size_memory_space(size_memory_space_) { + (void)IPcore_base_address; // suppress unused parameter warning + } ~VirtualMemoryModel() = default;