Skip to content

Commit aaa71b2

Browse files
dotChris90miklelappo
authored andcommitted
(conan-io#8561) Restructure directories add 2 3 4
* rename all folder to 2.3.X * add 2.3.4 and adding better tests * exclude Macos * typo * increase to 30s * rename back to all * Mac requires environment variables * removed again to check test now works on mac * because conan internal functions shall not be used * just try execution on mac os * just eval assert on linux .... because windows sometimes error * simplify test according to PR commits
1 parent 6eda2ad commit aaa71b2

File tree

4 files changed

+37
-2
lines changed

4 files changed

+37
-2
lines changed

recipes/fast-dds/all/conandata.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,16 @@ sources:
55
"2.3.3":
66
url: "https://github.com/eProsima/Fast-DDS/archive/refs/tags/v2.3.3.tar.gz"
77
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"
811
patches:
912
"2.3.2":
1013
- base_path: "source_subfolder"
1114
patch_file: "patches/2.3.2-0001-fix-find-asio-and-tinyxml2.patch"
1215
"2.3.3":
1316
- 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"

recipes/fast-dds/all/conanfile.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ def validate(self):
146146
# linking dynamic '*.dll' and static MT runtime
147147
raise ConanInvalidConfiguration("Mixing a dll {} library with a static runtime is a bad idea".format(self.name))
148148

149-
150149
def build(self):
151150
self._patch_sources()
152151
cmake = self._configure_cmake()
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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}

recipes/fast-dds/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ versions:
33
folder: all
44
"2.3.3":
55
folder: all
6+
"2.3.4":
7+
folder: all

0 commit comments

Comments
 (0)