diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-10-20 14:17:14 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-10-25 10:28:08 -0700 |
| commit | 854a1e474e9be180f39f19d98f1770c2a9599493 (patch) | |
| tree | e4d31cc5b18e09a1f5660269f8ffd8caa57b4649 | |
| parent | 9b7d93425fd17e1dff982ee13631b4fc18c31bbf (diff) | |
| download | vcpkg-854a1e474e9be180f39f19d98f1770c2a9599493.tar.gz vcpkg-854a1e474e9be180f39f19d98f1770c2a9599493.zip | |
[fastcdr] Fix installed cmake files
| -rw-r--r-- | ports/fastcdr/CONTROL | 2 | ||||
| -rw-r--r-- | ports/fastcdr/portfile.cmake | 10 | ||||
| -rw-r--r-- | ports/fastrtps/portfile.cmake | 6 |
3 files changed, 7 insertions, 11 deletions
diff --git a/ports/fastcdr/CONTROL b/ports/fastcdr/CONTROL index dfd04bf06..9076962c7 100644 --- a/ports/fastcdr/CONTROL +++ b/ports/fastcdr/CONTROL @@ -1,3 +1,3 @@ Source: fastcdr
-Version: 1.0.6-1
+Version: 1.0.6-2
Description: eProsima FastCDR is a C++ library that provides two serialization mechanisms. One is the standard CDR serialization mechanism, while the other is a faster implementation that modifies the standard.
diff --git a/ports/fastcdr/portfile.cmake b/ports/fastcdr/portfile.cmake index 91362f3b2..c3b6967d9 100644 --- a/ports/fastcdr/portfile.cmake +++ b/ports/fastcdr/portfile.cmake @@ -6,11 +6,7 @@ vcpkg_from_github( REF v1.0.6
SHA512 80861ff6a0283e1398306e081fe70d7d185f980e5714ae51864cae012b8f79719efa24e7f41025b2bfb2052cb2a3098436c75a38407f8f5a331593cb91868fb2
HEAD_REF master
-)
-
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
- PATCHES ${CMAKE_CURRENT_LIST_DIR}/install-cmake.patch
+ PATCHES install-cmake.patch
)
vcpkg_configure_cmake(
@@ -25,6 +21,10 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/fastcdr/cmake)
+file(READ "${CURRENT_PACKAGES_DIR}/share/fastcdr/fastcdrConfig.cmake" _contents)
+string(REPLACE "include(\${fastcdr_LIB_DIR}/fastcdr/cmake/fastcdrTargets.cmake)" "include(\${CMAKE_CURRENT_LIST_DIR}/fastcdrTargets.cmake)" _contents "${_contents}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/fastcdr/fastcdrConfig.cmake" "${_contents}")
+
vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/lib/fastcdr ${CURRENT_PACKAGES_DIR}/debug/lib/fastcdr)
diff --git a/ports/fastrtps/portfile.cmake b/ports/fastrtps/portfile.cmake index 0dce8ed73..8111de74d 100644 --- a/ports/fastrtps/portfile.cmake +++ b/ports/fastrtps/portfile.cmake @@ -6,11 +6,7 @@ vcpkg_from_github( REF b1779b608c7b5b2dcb101728f4213c58bdde74ee # waiting for next release
SHA512 9ec4a1e41296df1c0bc00926d925e0947602fabb68e9b28311e92739b0e1909a2993b15fc05eb31aeb9842ed50127f8d56571d09e57dd64ac6f37d0fed6cea73
HEAD_REF master
-)
-
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
- PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-install.patch
+ PATCHES fix-install.patch
)
vcpkg_configure_cmake(
|