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

Jump to bottom

Increase cmake minimum required [16437] #335

Merged
merged 4 commits into from
Dec 8, 2022
Merged

Increase cmake minimum required [16437] #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
13e5e0f
Refs #16427. Increase cmake minimum required
richiware Dec 7, 2022
ac854d7
Refs #16427. Update googletest
richiware Dec 7, 2022
7742ce7
Fix tests
pablogs9 Dec 8, 2022
10a0ae0
Fix tests
pablogs9 Dec 8, 2022
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cmake/SuperBuild.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -98,4 +98,4 @@ ExternalProject_Add(uclient
""
DEPENDS
${_deps}
)
)
2 changes: 1 addition & 1 deletion examples/Deployment/configurator_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions examples/ReplyAdder/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 7 additions & 1 deletion test/shared_memory/SharedMemory.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
1 change: 1 addition & 0 deletions test/unitary/session/Session.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ extern "C"
#include <string>
#include <array>
#include <vector>
#include <algorithm>

#define MTU 64
#define HISTORY 4
Expand Down