Skip to content

Commit c26e864

Browse files
committed
Refs #20631. Add support for CMAKE_COMPILE_WARNING_AS_ERROR
Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
1 parent 06c0026 commit c26e864

2 files changed

Lines changed: 13 additions & 5 deletions

File tree

CMakeLists.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ string(REGEX REPLACE "^version = u'([0-9]+.[0-9]+.[0-9]+)'"
2929

3030
project(fastdds-docs VERSION "${LIB_VERSION_STR}" LANGUAGES C CXX)
3131

32+
# In case CMake version less than 3.24, add the option CMAKE_COMPILE_WARNING_AS_ERROR.
33+
if (${CMAKE_VERSION} VERSION_LESS "3.24")
34+
option(CMAKE_COMPILE_WARNING_AS_ERROR "Treat warnings as errors" OFF)
35+
endif()
36+
3237

3338
####################################################################################################
3439
# Build Doxygen documentation
@@ -125,7 +130,9 @@ if (BUILD_DOCUMENTATION)
125130
# Generate the sphinx documentation
126131
add_custom_target(Sphinx ALL
127132
COMMAND
128-
${SPHINX_EXECUTABLE} -b ${FASTDDS_DOCS_BUILDER}
133+
${SPHINX_EXECUTABLE}
134+
$<$<BOOL:${CMAKE_COMPILE_WARNING_AS_ERROR}>:-W>
135+
-b ${FASTDDS_DOCS_BUILDER}
129136
# Tell Breathe where to find the Doxygen output
130137
-D breathe_projects.FastDDS=${DOXYGEN_OUTPUT_DIR}/xml
131138
${PYTHON_EXTRA_FLAG}

colcon.meta

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
names:
22
fastdds:
33
cmake-args:
4-
- "-DSECURITY=ON"
4+
- -DSECURITY=ON
55
fastdds_python:
66
cmake-args:
7-
- "-DBUILD_DOCUMENTATION=ON"
7+
- -DBUILD_DOCUMENTATION=ON
88
fastdds-docs:
99
cmake-args:
10-
- "-DBUILD_DOCUMENTATION=ON"
11-
- "-DCOMPILE_TESTS=ON"
10+
- -DBUILD_DOCUMENTATION=ON
11+
- -DCMAKE_COMPILE_WARNING_AS_ERROR=ON
12+
- -DCOMPILE_TESTS=ON

0 commit comments

Comments
 (0)