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

Look for the nddscpp CMake module #20

Merged
merged 3 commits into from
Apr 15, 2015
Merged

Look for the nddscpp CMake module #20

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c20e69e
Look for the nddscpp CMake module
Apr 14, 2015
80a92b3
Get libraries from rticonnextmsgcpp, requires librticonnextdds-messag…
Apr 15, 2015
060afce
Added nddscpp libraries
Apr 15, 2015
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
14 changes: 7 additions & 7 deletions connext_cmake_module/cmake/Modules/FindConnext.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ set(_expected_library_base_names
"nddsc"
"nddscore"
"nddscpp"
"rticonnextmsgc"
"rticonnextmsgcpp"
)

Expand Down Expand Up @@ -217,14 +216,15 @@ if(NOT "${_NDDSHOME} " STREQUAL " ")
set(Connext_FOUND TRUE)
else()
# try to find_package() it
find_package(ndds_cpp)
if(ndds_cpp_FOUND)
message(STATUS "Found RTI Connext: ${ndds_cpp_DIR}")
set(Connext_INCLUDE_DIRS ${ndds_cpp_INCLUDE_DIRS})
set(Connext_LIBRARIES ${ndds_cpp_LIBRARIES})
find_package(nddscpp)
find_package(rticonnextmsgcpp)
if(nddscpp_FOUND AND rticonnextmsgcpp_FOUND)
message(STATUS "Found RTI Connext: ${nddscpp_DIR} ${rticonnextmsgcpp_DIR}")
set(Connext_INCLUDE_DIRS ${nddscpp_INCLUDE_DIRS} ${rticonnextmsgcpp_INCLUDE_DIRS})
set(Connext_LIBRARIES ${nddscpp_LIBRARIES} ${rticonnextmsgcpp_LIBRARIES})
set(Connext_LIBRARY_DIRS "")
set(Connext_LIBRARY_DIR "")
set(Connext_DEFINITIONS ${ndds_cpp_DEFINITIONS})
set(Connext_DEFINITIONS ${nddscpp_DEFINITIONS} ${rticonnextmsgcpp_DEFINITIONS})
set(Connext_DDSGEN2 "/usr/bin/rtiddsgen2")
set(Connext_FOUND TRUE)

Expand Down