Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
net/ecal: Allow build with tinyxml2 with meson
- Loading branch information
Showing
3 changed files
with
43 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
net/ecal/files/patch-app_rec_rec__server__core_CMakeLists.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
--- app/rec/rec_server_core/CMakeLists.txt.orig 2023-10-27 08:38:06 UTC | ||
+++ app/rec/rec_server_core/CMakeLists.txt | ||
@@ -20,7 +20,8 @@ find_package(fineftp REQUIRED) | ||
find_package(Protobuf REQUIRED) | ||
find_package(spdlog REQUIRED) | ||
find_package(fineftp REQUIRED) | ||
-find_package(tinyxml2 REQUIRED) | ||
+find_package(PkgConfig REQUIRED) | ||
+pkg_check_modules(tinyxml2 REQUIRED IMPORTED_TARGET tinyxml2) | ||
|
||
set(PROJECT_NAME rec_server_core) | ||
|
||
@@ -66,7 +66,7 @@ target_link_libraries(${PROJECT_NAME} | ||
|
||
target_link_libraries(${PROJECT_NAME} | ||
PRIVATE | ||
- tinyxml2::tinyxml2 | ||
+ PkgConfig::tinyxml2 | ||
protobuf::libprotobuf | ||
eCAL::core | ||
eCAL::app_pb |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
--- app/sys/sys_core/CMakeLists.txt.orig 2023-10-27 08:38:06 UTC | ||
+++ app/sys/sys_core/CMakeLists.txt | ||
@@ -21,7 +21,8 @@ find_package(spdlog REQUIRED) | ||
find_package(Threads REQUIRED) | ||
find_package(Protobuf REQUIRED) | ||
find_package(spdlog REQUIRED) | ||
-find_package(tinyxml2 REQUIRED) | ||
+find_package(PkgConfig REQUIRED) | ||
+pkg_check_modules(tinyxml2 REQUIRED IMPORTED_TARGET tinyxml2) | ||
|
||
set(ecalsyscore_src | ||
include/ecalsys/ecal_sys.h | ||
@@ -88,7 +88,7 @@ target_link_libraries(${PROJECT_NAME} | ||
|
||
target_link_libraries(${PROJECT_NAME} | ||
Threads::Threads | ||
- tinyxml2::tinyxml2 | ||
+ PkgConfig::tinyxml2 | ||
spdlog::spdlog | ||
protobuf::libprotobuf | ||
eCAL::core |