mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 05:59:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[cyclonedds] Fix idl generation for the linux (#30235)

Browse Source
This commit is contained in:
Andrew Kornilov 2023-03-20 09:29:43 +03:00 committed by GitHub
parent a47031a65e
commit 956745569c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ports/cyclonedds/idlc-generate.patch
View File

@ -1,8 +1,8 @@
diff --git a/cmake/Modules/Generate.cmake b/cmake/Modules/Generate.cmake
index 0ed67d63..c22d9146 100644
index 0ed67d63..9037fe05 100644
--- a/cmake/Modules/Generate.cmake
+++ b/cmake/Modules/Generate.cmake
@@ -157,11 +157,19 @@ function(IDLC_GENERATE_GENERIC)
@@ -157,11 +157,25 @@ function(IDLC_GENERATE_GENERIC)
endforeach()
list(APPEND _outputs ${_file_outputs})
@ -11,18 +11,24 @@ index 0ed67d63..c22d9146 100644
- COMMAND ${_idlc_executable}
- ARGS ${_language} ${IDLC_ARGS} ${IDLC_INCLUDE_DIRS} ${_file}
- DEPENDS ${_files} ${_depends})
+ if(NOT APPLE)
+ add_custom_command(
+ OUTPUT ${_file_outputs}
+ COMMAND ${_idlc_executable}
+ ARGS ${_language} ${IDLC_ARGS} ${IDLC_INCLUDE_DIRS} ${_file}
+ DEPENDS ${_files} ${_depends})
+ else()
+ if(APPLE)
+ add_custom_command(
+ OUTPUT ${_file_outputs}
+ COMMAND ${CMAKE_COMMAND}
+ ARGS -E env "DYLD_LIBRARY_PATH=$<TARGET_FILE_DIR:${_idlc_executable}>/../../lib" $<TARGET_FILE:${_idlc_executable}> ${_language} ${IDLC_ARGS} ${IDLC_INCLUDE_DIRS} ${_file}
+ DEPENDS ${_files} ${_depends})
+ elseif(UNIX)
+ add_custom_command(
+ OUTPUT ${_file_outputs}
+ COMMAND ${CMAKE_COMMAND}
+ ARGS -E env "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:${_idlc_executable}>/../../lib" $<TARGET_FILE:${_idlc_executable}> ${_language} ${IDLC_ARGS} ${IDLC_INCLUDE_DIRS} ${_file}
+ DEPENDS ${_files} ${_depends})
+ else()
+ add_custom_command(
+ OUTPUT ${_file_outputs}
+ COMMAND ${_idlc_executable}
+ ARGS ${_language} ${IDLC_ARGS} ${IDLC_INCLUDE_DIRS} ${_file}
+ DEPENDS ${_files} ${_depends})
+ endif()
endforeach()

2
ports/cyclonedds/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "cyclonedds",
"version-semver": "0.10.2",
"port-version": 1,
"port-version": 2,
"description": "Eclipse Cyclone DDS is a very performant and robust open-source implementation of the OMG DDS specification",
"homepage": "https://cyclonedds.io",
"license": "EPL-2.0 OR BSD-3-Clause",

2
versions/baseline.json
View File

@ -1922,7 +1922,7 @@
},
"cyclonedds": {
"baseline": "0.10.2",
"port-version": 1
"port-version": 2
},
"cyclonedds-cxx": {
"baseline": "0.10.2",

5
versions/c-/cyclonedds.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "88e7a85946eae33b8e9d686107d7e303afa2a59e",
"version-semver": "0.10.2",
"port-version": 2
},
{
"git-tree": "7be6ebe8452bb763bf4dd1374e981ff455b54aaa",
"version-semver": "0.10.2",