From 1c4659b15ae65e44570e926cbab98ce0524384a8 Mon Sep 17 00:00:00 2001 From: Dennis Potman Date: Tue, 19 Sep 2023 11:39:24 +0200 Subject: [PATCH 1/3] Add linker option to treat linker warnings as errors when WERROR is set Signed-off-by: Dennis Potman --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4103d46144..0c87a4f3b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,9 +93,9 @@ if("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "-Wconditional-uninitialized" "-Wshadow") add_compile_options(${wflags}) - add_link_options(-undefined error) if(${WERROR}) add_compile_options(-Werror) + add_link_options(-Werror) endif() if("${CMAKE_GENERATOR}" STREQUAL "Ninja") add_compile_options(-Xclang -fcolor-diagnostics) @@ -110,6 +110,7 @@ elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") endif() if(${WERROR}) add_compile_options(-Werror) + add_link_options(-Werror) endif() if("${CMAKE_GENERATOR}" STREQUAL "Ninja") add_compile_options(-fdiagnostics-color=always) @@ -119,6 +120,7 @@ elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC") add_compile_options(/W3) if(${WERROR}) add_compile_options(/WX) + add_link_options(/WX) endif() endif() From 658f4d4e4ae4cfd64e509254adbd71448cd45ea9 Mon Sep 17 00:00:00 2001 From: Dennis Potman Date: Tue, 19 Sep 2023 11:34:42 +0200 Subject: [PATCH 2/3] Fix (internal) doxygen return value description Signed-off-by: Dennis Potman --- src/core/ddsi/src/ddsi__security_omg.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/core/ddsi/src/ddsi__security_omg.h b/src/core/ddsi/src/ddsi__security_omg.h index 9820991453..14f0d6ec42 100644 --- a/src/core/ddsi/src/ddsi__security_omg.h +++ b/src/core/ddsi/src/ddsi__security_omg.h @@ -328,9 +328,7 @@ bool ddsi_omg_get_writer_security_info (const struct ddsi_writer *wr, ddsi_secur * * @param[in] wr Writer to determine the publication writer from. * - * @returns unsigned - * @retval DDSI_ENTITYID_SEDP_BUILTIN_PUBLICATIONS_SECURE_WRITER - * @retval DDSI_ENTITYID_SEDP_BUILTIN_PUBLICATIONS_WRITER + * @returns Entity id to use for publishing writer discovery data */ unsigned ddsi_determine_publication_writer(const struct ddsi_writer *wr); @@ -386,9 +384,7 @@ bool ddsi_omg_get_reader_security_info (const struct ddsi_reader *rd, ddsi_secur * * @param[in] rd Reader to determine the subscription writer from. * - * @returns unsigned - * @retval DDSI_ENTITYID_SEDP_BUILTIN_SUBSCRIPTIONS_SECURE_WRITER - * @retval DDSI_ENTITYID_SEDP_BUILTIN_SUBSCRIPTIONS_WRITER + * @returns Entity id to use for publishing reader discovery data */ unsigned ddsi_determine_subscription_writer(const struct ddsi_reader *rd); @@ -402,8 +398,7 @@ unsigned ddsi_determine_subscription_writer(const struct ddsi_reader *rd); * * @param[in] tp Topic to determine the writer from. * - * @returns unsigned - * @retval DDSI_ENTITYID_SEDP_BUILTIN_TOPIC_WRITER + * @returns Entity id to use for publishing topic discovery data */ unsigned ddsi_determine_topic_writer(const struct ddsi_topic *tp); #endif /* DDS_HAS_TOPIC_DISCOVERY */ From 8f80a0e572fd881edbcf77d611707db7c6186f94 Mon Sep 17 00:00:00 2001 From: Erik Boasson Date: Fri, 15 Sep 2023 14:57:03 +0200 Subject: [PATCH 3/3] Windows CI has an OpenSSL problem, use Chocolatey Signed-off-by: Erik Boasson --- .azure/templates/build-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.azure/templates/build-test.yml b/.azure/templates/build-test.yml index ba5d540755..03f4e3ec2b 100644 --- a/.azure/templates/build-test.yml +++ b/.azure/templates/build-test.yml @@ -62,6 +62,7 @@ steps: } else { Write-Host "###vso[task.setvariable variable=build_tool_options;]-j 4" } + choco install -y openssl condition: eq(variables['Agent.OS'], 'Windows_NT') name: setup_windows - task: Cache@2