Skip to content

Commit ea185fc

Browse files
authored
Fix version and FastCDR patch file in QNX build files (#3531)
* Refs #18673: Fix FastCDR QNX patch Signed-off-by: Javier Santiago <[email protected]> * Refs #18673: Updated Fast-DDS version on QNX common.mk Signed-off-by: Javier Santiago <[email protected]> * Refs #18673: Calculate Fast DDS version from CMakeLists.txt instead of hardcoding it on QNX builds Signed-off-by: Javier Santiago <[email protected]> --------- Signed-off-by: Javier Santiago <[email protected]>
1 parent 8644a04 commit ea185fc

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

build_qnx/common.mk

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ NAME=Fast-DDS
1111
#and USE_INSTALL_ROOT
1212
FAST-DDS_INSTALL_ROOT ?= $(INSTALL_ROOT_$(OS))
1313

14-
FAST-DDS_VERSION = .2.10.0
14+
# These commands require GNU Make
15+
FAST-DDS_CMAKE_VERSION = $(shell bash -c "grep VERSION $(PROJECT_ROOT)/../CMakeLists.txt | grep fastrtps ")
16+
FAST-DDS_VERSION = .$(subst $\",,$(word 3,$(FAST-DDS_CMAKE_VERSION)))
1517

1618
#choose Release or Debug
1719
CMAKE_BUILD_TYPE ?= Release

build_qnx/qnx_patches/fastcdr_qnx.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
2-
index da35d03..19f3393 100644
2+
index dcbf7ab..9cad45f 100644
33
--- a/src/cpp/CMakeLists.txt
44
+++ b/src/cpp/CMakeLists.txt
5-
@@ -54,6 +54,10 @@ elseif(NOT EPROSIMA_INSTALLER)
6-
7-
target_compile_definitions(${PROJECT_NAME} PRIVATE ${PROJECT_NAME_UPPER}_SOURCE)
5+
@@ -63,6 +63,10 @@ elseif(NOT EPROSIMA_INSTALLER)
6+
$<$<STREQUAL:$<TARGET_PROPERTY:${PROJECT_NAME},TYPE>,SHARED_LIBRARY>:${PROJECT_NAME_UPPER}_DYN_LINK>
7+
)
88

99
+ if(QNX)
1010
+ target_compile_definitions(${PROJECT_NAME} PRIVATE _QNX_SOURCE)

0 commit comments

Comments
 (0)