Skip to content

Commit

Permalink
Require minimum versions on CMakeLists template.
Browse files Browse the repository at this point in the history
The code generated is now designed for Fast CDR >= 2.0 and Fast DDS >= 2.12,
so the generated CMakeLists.txt should require those versions.

Signed-off-by: Miguel Company <[email protected]>
  • Loading branch information
MiguelCompany committed Sep 13, 2023
1 parent 6a2c67d commit 8eae760
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_EXTENSIONS OFF)

# Find requirements
find_package(fastcdr REQUIRED)
find_package(fastrtps REQUIRED)
find_package(fastcdr 2 REQUIRED)
find_package(fastrtps 2.12 REQUIRED)

$solution.projects : { project | $pub_sub_execs(project=project, libraries=solution.libraries, test=test)$}; separator="\n"$

Expand Down
2 changes: 1 addition & 1 deletion thirdparty/idl-parser
Submodule idl-parser updated 55 files
+5 −1 build.gradle
+45 −0 src/it/java/com/eprosima/integration/IDL.java
+19 −15 src/it/java/com/eprosima/integration/Test.java
+34 −52 src/it/java/com/eprosima/integration/TestManager.java
+7 −13 src/main/antlr/com/eprosima/idl/parser/grammar/IDL.g4
+9 −37 src/main/java/com/eprosima/idl/context/Context.java
+51 −0 src/main/java/com/eprosima/idl/generator/manager/TemplateExtension.java
+87 −26 src/main/java/com/eprosima/idl/generator/manager/TemplateGroup.java
+99 −39 src/main/java/com/eprosima/idl/generator/manager/TemplateManager.java
+3 −1 src/main/java/com/eprosima/idl/parser/strategy/DefaultErrorStrategy.java
+0 −8 src/main/java/com/eprosima/idl/parser/tree/Annotation.java
+13 −85 src/main/java/com/eprosima/idl/parser/typecode/AliasTypeCode.java
+31 −37 src/main/java/com/eprosima/idl/parser/typecode/ArrayTypeCode.java
+20 −20 src/main/java/com/eprosima/idl/parser/typecode/BitmaskTypeCode.java
+14 −31 src/main/java/com/eprosima/idl/parser/typecode/BitsetTypeCode.java
+13 −19 src/main/java/com/eprosima/idl/parser/typecode/EnumTypeCode.java
+23 −22 src/main/java/com/eprosima/idl/parser/typecode/MapTypeCode.java
+1 −13 src/main/java/com/eprosima/idl/parser/typecode/Member.java
+0 −33 src/main/java/com/eprosima/idl/parser/typecode/MemberedTypeCode.java
+4 −4 src/main/java/com/eprosima/idl/parser/typecode/PrimitiveTypeCode.java
+19 −19 src/main/java/com/eprosima/idl/parser/typecode/SequenceTypeCode.java
+17 −17 src/main/java/com/eprosima/idl/parser/typecode/SetTypeCode.java
+13 −7 src/main/java/com/eprosima/idl/parser/typecode/StringTypeCode.java
+19 −56 src/main/java/com/eprosima/idl/parser/typecode/StructTypeCode.java
+51 −74 src/main/java/com/eprosima/idl/parser/typecode/TypeCode.java
+4 −9 src/main/java/com/eprosima/idl/parser/typecode/UnionMember.java
+15 −59 src/main/java/com/eprosima/idl/parser/typecode/UnionTypeCode.java
+155 −154 src/main/java/com/eprosima/idl/test/TestIDLParser.java
+67 −78 src/main/java/com/eprosima/solution/Project.java
+4 −4 src/main/resources/com/eprosima/idl/templates/CTypes.stg
+7 −0 src/main/resources/com/eprosima/idl/templates/JavaTypes.stg
+7 −1 src/main/resources/com/eprosima/idl/templates/Types.stg
+6 −0 src/main/resources/com/eprosima/idl/templates/TypesCInterface.stg
+31 −0 test/idls/array_basic.idl
+10 −0 test/idls/array_custom.idl
+31 −0 test/idls/array_multi_dim.idl
+5 −0 test/idls/array_string.idl
+18 −0 test/idls/basic.idl
+30 −0 test/idls/bitset_bitmask.idl
+192 −0 test/idls/coverage_basic.idl
+94 −0 test/idls/coverage_complex.idl
+10 −0 test/idls/custom.idl
+10 −0 test/idls/declaration_order.idl
+117 −0 test/idls/forward_decls.idl
+11 −0 test/idls/include.idl
+6 −0 test/idls/inheritance.idl
+84 −0 test/idls/new_features_4_2.idl
+29 −0 test/idls/sequence_basic.idl
+19 −0 test/idls/sequence_basic_in_module_typedef.idl
+11 −0 test/idls/sequence_custom.idl
+12 −0 test/idls/sequence_custom_in_module_typedef.idl
+7 −0 test/idls/sequence_string.idl
+13 −0 test/idls/sequence_string_in_module_typedef.idl
+5 −0 test/idls/string.idl
+38 −0 test/idls/struct_empty.idl

0 comments on commit 8eae760

Please sign in to comment.