Skip to content

Commit 92eba54

Browse files
4ntnCarlosespicur
authored andcommitted
Fix rebase
Signed-off-by: Antón Casas <antoncasas@eprosima.com>
1 parent f54b105 commit 92eba54

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ add_library(
9191
${rcutils_sources})
9292
target_include_directories(${PROJECT_NAME} PUBLIC
9393
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
94+
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>"
9495
"$<INSTALL_INTERFACE:include/${PROJECT_NAME}>")
9596

9697
# Causes the visibility macros to use dllexport rather than dllimport,
@@ -569,5 +570,5 @@ ament_export_dependencies(ament_cmake)
569570
ament_package()
570571

571572
install(
572-
DIRECTORY include/
573+
DIRECTORY include/ ${CMAKE_CURRENT_BINARY_DIR}/include/
573574
DESTINATION include/${PROJECT_NAME})

include/rcutils/error_handling.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ extern "C"
3939
#include "rcutils/visibility_control.h"
4040
#include "rcutils/configuration_flags.h"
4141

42-
#ifndef(RCUTILS_NO_FILESYSTEM)
42+
#ifndef RCUTILS_NO_FILESYSTEM
4343
/// Write the given msg out to stderr, limiting the buffer size in the `fwrite`.
4444
/**
4545
* This ensures that there is an upper bound to a buffer overrun if `msg` is

include/rcutils/logging_macros.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ extern "C"
3939
* Use RCUTILS_LOG_MIN_SEVERITY_NONE to compile out all macros.
4040
*/
4141
#ifndef RCUTILS_LOG_MIN_SEVERITY
42-
#define RCUTILS_LOG_MIN_SEVERITY RCUTILS_LOG_MIN_SEVERITY_DEBUG
42+
#define RCUTILS_LOG_MIN_SEVERITY RCUTILS_LOG_MIN_SEVERITY_NONE
4343
#endif
4444

4545
/**

0 commit comments

Comments
 (0)