aboutsummaryrefslogtreecommitdiff
path: root/ports/moos-essential
diff options
context:
space:
mode:
authorStefano Sinigardi <stesinigardi@hotmail.com>2019-10-07 19:35:13 +0200
committerCurtis J Bezault <curtbezault@gmail.com>2019-10-07 10:35:13 -0700
commit726c11148105a97aef39bec024fdb7c140b1b154 (patch)
tree26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/moos-essential
parente86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff)
downloadvcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz
vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'ports/moos-essential')
-rw-r--r--ports/moos-essential/CONTROL2
-rw-r--r--ports/moos-essential/portfile.cmake12
2 files changed, 3 insertions, 11 deletions
diff --git a/ports/moos-essential/CONTROL b/ports/moos-essential/CONTROL
index 06cc1c0f0..32fd954e3 100644
--- a/ports/moos-essential/CONTROL
+++ b/ports/moos-essential/CONTROL
@@ -1,5 +1,5 @@
Source: moos-essential
-Version: 10.0.1-1
+Version: 10.0.1-2
Description: a set of useful applications that leverage the core-moos communications layer.
Homepage: https://sites.google.com/site/moossoftware/
Build-Depends: moos-core
diff --git a/ports/moos-essential/portfile.cmake b/ports/moos-essential/portfile.cmake
index f0a55923e..634b1530e 100644
--- a/ports/moos-essential/portfile.cmake
+++ b/ports/moos-essential/portfile.cmake
@@ -6,14 +6,8 @@ vcpkg_from_github(
REF b897ea86dba8b61412dc48ac0cfb5ff34cdaf5f6
SHA512 7284744d211dcdcb0cd321eec96f3632ccda690e8894261f4f09a06bc8faefb2de68f4f2f755f4eeef5bb586044e98ac65cdd18c15193a1a4632bd2f4208c52f
HEAD_REF master
-)
-
-message(STATUS "MOOS Essential Source Path: ${SOURCE_PATH}")
-message(STATUS "MOOS Essential CMAKE_CURRENT_LIST_DIR: ${CMAKE_CURRENT_LIST_DIR}")
-
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
- PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix.patch
+ PATCHES
+ fix.patch
)
vcpkg_configure_cmake(
@@ -39,5 +33,3 @@ endif()
file(WRITE ${CURRENT_PACKAGES_DIR}/include/fake_header.h "// fake header to pass vcpkg post install check \n")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright "see moos-core for copyright\n" )
-#
-#