niklas/rmw_cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove Fast-CDR references in CMake config

Browse source
This commit is contained in:
Erik Boasson 2019-05-05 12:31:17 +08:00
parent f7de5522d7
commit c55cbfda95
1 changed files with 1 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

32
cyclonedds_cmake_module/cmake/Modules/FindCycloneDDS.cmake
View file

@ -14,7 +14,7 @@
############################################################################### ###############################################################################
# #
# CMake module for finding ADLINK CycloneDDS. # CMake module for finding Eclipse Cyclone DDS.
# #
# Output variables: # Output variables:
# #
@ -33,35 +33,8 @@
set(CycloneDDS_FOUND FALSE) set(CycloneDDS_FOUND FALSE)
find_package(fastcdr REQUIRED CONFIG)
find_package(CycloneDDS REQUIRED CONFIG) find_package(CycloneDDS REQUIRED CONFIG)
string(REGEX MATCH "^[0-9]+\\.[0-9]+" fastcdr_MAJOR_MINOR_VERSION "${fastcdr_VERSION}")
#string(REGEX MATCH "^[0-9]+\\.[0-9]+" cyclonedds_MAJOR_MINOR_VERSION "${cyclonedds_VERSION}")
find_library(FastCDR_LIBRARY_RELEASE
NAMES fastcdr-${fastcdr_MAJOR_MINOR_VERSION} fastcdr)
find_library(FastCDR_LIBRARY_DEBUG
NAMES fastcdrd-${fastcdr_MAJOR_MINOR_VERSION})
if(FastCDR_LIBRARY_RELEASE AND FastCDR_LIBRARY_DEBUG)
set(FastCDR_LIBRARIES
optimized ${FastCDR_LIBRARY_RELEASE}
debug ${FastCDR_LIBRARY_DEBUG}
)
elseif(FastCDR_LIBRARY_RELEASE)
set(FastCDR_LIBRARIES
${FastCDR_LIBRARY_RELEASE}
)
elseif(FastCDR_LIBRARY_DEBUG)
set(FastCDR_LIBRARIES
${FastCDR_LIBRARY_DEBUG}
)
else()
set(FastCDR_LIBRARIES "")
endif()
#find_library(CycloneDDS_LIBRARY_RELEASE #find_library(CycloneDDS_LIBRARY_RELEASE
# NAMES cyclonedds-${cyclonedds_MAJOR_MINOR_VERSION} cyclonedds) # NAMES cyclonedds-${cyclonedds_MAJOR_MINOR_VERSION} cyclonedds)
find_library(CycloneDDS_LIBRARY_RELEASE find_library(CycloneDDS_LIBRARY_RELEASE
@ -75,17 +48,14 @@ if(CycloneDDS_LIBRARY_RELEASE AND CycloneDDS_LIBRARY_DEBUG)
set(CycloneDDS_LIBRARIES set(CycloneDDS_LIBRARIES
optimized ${CycloneDDS_LIBRARY_RELEASE} optimized ${CycloneDDS_LIBRARY_RELEASE}
debug ${CycloneDDS_LIBRARY_DEBUG} debug ${CycloneDDS_LIBRARY_DEBUG}
${FastCDR_LIBRARIES}
) )
elseif(CycloneDDS_LIBRARY_RELEASE) elseif(CycloneDDS_LIBRARY_RELEASE)
set(CycloneDDS_LIBRARIES set(CycloneDDS_LIBRARIES
${CycloneDDS_LIBRARY_RELEASE} ${CycloneDDS_LIBRARY_RELEASE}
${FastCDR_LIBRARIES}
) )
elseif(CycloneDDS_LIBRARY_DEBUG) elseif(CycloneDDS_LIBRARY_DEBUG)
set(CycloneDDS_LIBRARIES set(CycloneDDS_LIBRARIES
${CycloneDDS_LIBRARY_DEBUG} ${CycloneDDS_LIBRARY_DEBUG}
${FastCDR_LIBRARIES}
) )
else() else()
set(CycloneDDS_LIBRARIES "") set(CycloneDDS_LIBRARIES "")