xiahb
/
Micro-XRCE-DDS-Client
mirror of https://github.com/eProsima/Micro-XRCE-DDS-Client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Increase cmake minimum required (#335) 

* Refs #16427. Increase cmake minimum required

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

* Refs #16427. Update googletest

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>

* Fix tests

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

* Fix tests

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>

Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev>
Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
This commit is contained in:
Ricardo González 2022-12-08 11:54:19 +01:00 committed by GitHub
parent f9297008a9
commit bb23a278fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -15,7 +15,7 @@
################################################################################
## CMake build rules for Micro XRCE-DDS Client
################################################################################
cmake_minimum_required(VERSION 3.5.0 FATAL_ERROR)
cmake_minimum_required(VERSION 3.16)
###############################################################################
# Build options

4
cmake/SuperBuild.cmake
View File

@ -66,7 +66,7 @@ if(UCLIENT_BUILD_TESTS)
GIT_REPOSITORY
https://github.com/google/googletest.git
GIT_TAG
2fe3bd994b3189899d93f1d5a881e725e046fdc2
release-1.11.0
PREFIX
${PROJECT_BINARY_DIR}/googletest
INSTALL_DIR
@ -98,4 +98,4 @@ ExternalProject_Add(uclient
""
DEPENDS
${_deps}
)
)

2
examples/Deployment/configurator_client.c
View File

@ -55,7 +55,7 @@ int main(
char** argv)
{
// Check args
uint32_t key;
uint32_t key = 0;
int create_delete = 0;
int pub_sub = 0;
uint16_t ids = 0;

1
examples/ReplyAdder/main.c
View File

@ -146,6 +146,7 @@ int main(
delivery_control.max_samples = UXR_MAX_SAMPLES_UNLIMITED;
uint16_t read_data_req =
uxr_buffer_request_data(&session, reliable_out, replier_id, reliable_in, &delivery_control);
(void) read_data_req;
// Read request
bool connected = true;

8
test/shared_memory/SharedMemory.cpp
View File

@ -999,7 +999,13 @@ TEST_P(SharedMemoryTest, SharedMemoryReqRepFragmentation)
}
#endif // ifdef UCLIENT_PROFILE_MULTITHREAD
INSTANTIATE_TEST_CASE_P(
#ifdef INSTANTIATE_TEST_SUITE_P
#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z, w) INSTANTIATE_TEST_SUITE_P(x, y, z, w)
#else
#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z, w) INSTANTIATE_TEST_CASE_P(x, y, z, w)
#endif // ifdef INSTANTIATE_TEST_SUITE_P
GTEST_INSTANTIATE_TEST_MACRO(
SharedMemoryTest,
SharedMemoryTest,
::testing::Values(XRCECreationMode::XRCE_XML_CREATION, XRCECreationMode::XRCE_BIN_CREATION),

1
test/unitary/session/Session.cpp
View File

@ -32,6 +32,7 @@ extern "C"
#include <string>
#include <array>
#include <vector>
#include <algorithm>
#define MTU 64
#define HISTORY 4