Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build and doxygen fixes #1831

Merged
merged 3 commits into from
Sep 19, 2023
Merged

Build and doxygen fixes #1831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c4659b
Add linker option to treat linker warnings as errors when WERROR is set
dpotman Sep 19, 2023
658f4d4
Fix (internal) doxygen return value description
dpotman Sep 19, 2023
8f80a0e
Windows CI has an OpenSSL problem, use Chocolatey
eboasson Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .azure/templates/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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()

Expand Down
11 changes: 3 additions & 8 deletions src/core/ddsi/src/ddsi__security_omg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand All @@ -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 */
Expand Down