File tree Expand file tree Collapse file tree 4 files changed +37
-2
lines changed Expand file tree Collapse file tree 4 files changed +37
-2
lines changed Original file line number Diff line number Diff line change @@ -5,10 +5,16 @@ sources:
5
5
" 2.3.3 " :
6
6
url : " https://github.com/eProsima/Fast-DDS/archive/refs/tags/v2.3.3.tar.gz"
7
7
sha256 : " 5EBF27D810C6AB68EEF7D42937CD421D85E50509AE96883239979A1B3A2F4F82"
8
+ " 2.3.4 " :
9
+ url : " https://github.com/eProsima/Fast-DDS/archive/refs/tags/v2.3.4.tar.gz"
10
+ sha256 : " B1B2322DE0CA55A16495666E3FBDA8ACA32B888BBFAECDA29F2FFC4B072EF7AC"
8
11
patches :
9
12
" 2.3.2 " :
10
13
- base_path : " source_subfolder"
11
14
patch_file : " patches/2.3.2-0001-fix-find-asio-and-tinyxml2.patch"
12
15
" 2.3.3 " :
13
16
- base_path : " source_subfolder"
14
- patch_file : " patches/2.3.3-0001-fix-find-asio-and-tinyxml2.patch"
17
+ patch_file : " patches/2.3.X-0001-fix-find-asio-and-tinyxml2.patch"
18
+ " 2.3.4 " :
19
+ - base_path : " source_subfolder"
20
+ patch_file : " patches/2.3.X-0001-fix-find-asio-and-tinyxml2.patch"
Original file line number Diff line number Diff line change @@ -146,7 +146,6 @@ def validate(self):
146
146
# linking dynamic '*.dll' and static MT runtime
147
147
raise ConanInvalidConfiguration ("Mixing a dll {} library with a static runtime is a bad idea" .format (self .name ))
148
148
149
-
150
149
def build (self ):
151
150
self ._patch_sources ()
152
151
cmake = self ._configure_cmake ()
Original file line number Diff line number Diff line change
1
+ diff --git a/CMakeLists.txt b/CMakeLists.txt
2
+ index 8a9cb0209..400c681e7 100644
3
+ --- a/CMakeLists.txt
4
+ +++ b/CMakeLists.txt
5
+ @@ -225,8 +225,8 @@ if(NOT BUILD_SHARED_LIBS)
6
+ endif()
7
+
8
+ eprosima_find_package(fastcdr REQUIRED)
9
+ - eprosima_find_thirdparty(Asio asio VERSION 1.10.8)
10
+ - eprosima_find_thirdparty(TinyXML2 tinyxml2)
11
+ + eprosima_find_thirdparty(asio REQUIRED)
12
+ + eprosima_find_thirdparty(tinyxml2 REQUIRED)
13
+
14
+ find_package(foonathan_memory REQUIRED)
15
+ message(STATUS "Found foonathan_memory: ${foonathan_memory_DIR}")
16
+ diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
17
+ index d26915242..f00e36ea6 100644
18
+ --- a/src/cpp/CMakeLists.txt
19
+ +++ b/src/cpp/CMakeLists.txt
20
+ @@ -456,7 +456,7 @@ elseif(NOT EPROSIMA_INSTALLER)
21
+ # Link library to external libraries.
22
+ target_link_libraries(${PROJECT_NAME} ${PRIVACY} fastcdr foonathan_memory
23
+ ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS}
24
+ - ${TINYXML2_LIBRARY}
25
+ + tinyxml2::tinyxml2
26
+ $<$<BOOL:${LINK_SSL}>:OpenSSL::SSL$<SEMICOLON>OpenSSL::Crypto$<$<BOOL:${WIN32}>:$<SEMICOLON>crypt32.lib>>
27
+ $<$<BOOL:${WIN32}>:iphlpapi$<SEMICOLON>Shlwapi>
28
+ ${THIRDPARTY_BOOST_LINK_LIBS}
Original file line number Diff line number Diff line change @@ -3,3 +3,5 @@ versions:
3
3
folder : all
4
4
" 2.3.3 " :
5
5
folder : all
6
+ " 2.3.4 " :
7
+ folder : all
You can’t perform that action at this time.
0 commit comments