Skip to content
This repository has been archived by the owner on Jun 21, 2023. It is now read-only.

reduce verbosity when Connext is not available #17

Merged
merged 1 commit into from
Nov 27, 2018
Merged

reduce verbosity when Connext is not available #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion connext_cmake_module/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@ find_package(ament_cmake REQUIRED)

set(${PROJECT_NAME}_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
find_package(Connext MODULE)
find_package(Connext QUIET MODULE)
if(Connext_FOUND)
find_package(Connext MODULE)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, this one is curious. I would've expected find_package(Connext QUIET MODULE) to be just like find_package(Connext MODULE) but without the errors if the module isn't found.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But when successful you want to see the actual messages from the module since it provides valuable information.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point.

endif()
if(Connext_HOME)
file(TO_NATIVE_PATH "${Connext_HOME}" Connext_HOME)
if(WIN32)
Expand Down
5 changes: 4 additions & 1 deletion rosidl_typesupport_connext_c/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ endif()
find_package(ament_cmake REQUIRED)

find_package(connext_cmake_module REQUIRED)
find_package(Connext MODULE)
find_package(Connext QUIET MODULE)
if(Connext_FOUND)
find_package(Connext MODULE)
endif()
if(NOT Connext_FOUND OR CONNEXT_STATIC_DISABLE)
ament_package()
if(NOT Connext_FOUND)
Expand Down
5 changes: 4 additions & 1 deletion rosidl_typesupport_connext_cpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ find_package(ament_cmake REQUIRED)
find_package(rcutils REQUIRED)

find_package(connext_cmake_module REQUIRED)
find_package(Connext MODULE)
find_package(Connext QUIET MODULE)
if(Connext_FOUND)
find_package(Connext MODULE)
endif()
if(NOT Connext_FOUND OR CONNEXT_STATIC_DISABLE)
ament_package()
if(NOT Connext_FOUND)
Expand Down