Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid superbuild FastCDR with UAGENT_USE_SYSTEM_FASTDDS #255

Merged
merged 1 commit into from
Jun 29, 2021
Merged

Avoid superbuild FastCDR with UAGENT_USE_SYSTEM_FASTDDS #255

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
10 changes: 7 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,12 @@ option(UAGENT_TWEAK_XRCE_WRITE_LIMIT "This feature uses a tweak to allow XRCE WR
###############################################################################
set(_deps "")

set(_fastcdr_version 1.0.13)
set(_fastcdr_tag v1.0.13)
if(UAGENT_USE_SYSTEM_FASTDDS)
set(_fastcdr_version 1)
else()
set(_fastcdr_version 1.0.13)
set(_fastcdr_tag v1.0.13)
endif()
list(APPEND _deps "fastcdr\;${_fastcdr_version}")

if(UAGENT_P2P_PROFILE)
Expand All @@ -87,7 +91,7 @@ if(UAGENT_FAST_PROFILE)
set(_fastdds_version 2.0.2)
set(_fastdds_tag v2.0.2)
set(_foonathan_memory_tag c619113) # This tag should be updated every time it gets updated in foonathan_memory_vendor eProsima's package
endif()
endif()
list(APPEND _deps "fastrtps\;${_fastdds_version}")
endif()

Expand Down
56 changes: 29 additions & 27 deletions cmake/SuperBuild.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,33 +49,35 @@ if(UAGENT_P2P_PROFILE)
endif()

# Fast CDR.
unset(fastcdr_DIR CACHE)
find_package(fastcdr ${_fastcdr_version} EXACT QUIET)
if(NOT fastcdr_FOUND)
ExternalProject_Add(fastcdr
GIT_REPOSITORY
https://github.com/eProsima/Fast-CDR.git
GIT_TAG
${_fastcdr_tag}
PREFIX
${PROJECT_BINARY_DIR}/fastcdr
INSTALL_DIR
${PROJECT_BINARY_DIR}/temp_install/fastcdr-${_fastcdr_version}
CMAKE_CACHE_ARGS
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}
UPDATE_COMMAND
COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/src/cpp/CMakeLists.txt <SOURCE_DIR>/src/cpp/CMakeLists.txt.bak
COMMAND ${CMAKE_COMMAND} -DSOVERSION_FILE=<SOURCE_DIR>/src/cpp/CMakeLists.txt -P ${PROJECT_SOURCE_DIR}/cmake/Soversion.cmake
TEST_COMMAND
COMMAND ${CMAKE_COMMAND} -E rename <SOURCE_DIR>/src/cpp/CMakeLists.txt.bak <SOURCE_DIR>/src/cpp/CMakeLists.txt
)
list(APPEND _deps fastcdr)
if(NOT UAGENT_USE_SYSTEM_FASTDDS)
unset(fastcdr_DIR CACHE)
find_package(fastcdr ${_fastcdr_version} EXACT QUIET)
if(NOT fastcdr_FOUND)
ExternalProject_Add(fastcdr
GIT_REPOSITORY
https://github.com/eProsima/Fast-CDR.git
GIT_TAG
${_fastcdr_tag}
PREFIX
${PROJECT_BINARY_DIR}/fastcdr
INSTALL_DIR
${PROJECT_BINARY_DIR}/temp_install/fastcdr-${_fastcdr_version}
CMAKE_CACHE_ARGS
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}
-DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
-DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}
UPDATE_COMMAND
COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/src/cpp/CMakeLists.txt <SOURCE_DIR>/src/cpp/CMakeLists.txt.bak
COMMAND ${CMAKE_COMMAND} -DSOVERSION_FILE=<SOURCE_DIR>/src/cpp/CMakeLists.txt -P ${PROJECT_SOURCE_DIR}/cmake/Soversion.cmake
TEST_COMMAND
COMMAND ${CMAKE_COMMAND} -E rename <SOURCE_DIR>/src/cpp/CMakeLists.txt.bak <SOURCE_DIR>/src/cpp/CMakeLists.txt
)
list(APPEND _deps fastcdr)
endif()
endif()

if(UAGENT_FAST_PROFILE AND NOT UAGENT_USE_SYSTEM_FASTDDS)
Expand Down