aboutsummaryrefslogtreecommitdiff
path: root/ports/epsilon
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/epsilon
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/epsilon')
-rw-r--r--ports/epsilon/CONTROL2
-rw-r--r--ports/epsilon/portfile.cmake3
2 files changed, 2 insertions, 3 deletions
diff --git a/ports/epsilon/CONTROL b/ports/epsilon/CONTROL
index 3b740a976..be2f78562 100644
--- a/ports/epsilon/CONTROL
+++ b/ports/epsilon/CONTROL
@@ -1,4 +1,4 @@
Source: epsilon
-Version: 0.9.2
+Version: 0.9.2-1
Homepage: https://sourceforge.net/projects/epsilon-project/
Description: EPSILON is an Open Source wavelet image compressor, that is aimed on parallel and robust image processing. \ No newline at end of file
diff --git a/ports/epsilon/portfile.cmake b/ports/epsilon/portfile.cmake
index 70aee7e1e..e21cc3d3a 100644
--- a/ports/epsilon/portfile.cmake
+++ b/ports/epsilon/portfile.cmake
@@ -9,7 +9,7 @@ vcpkg_download_distfile(ARCHIVE
# support out of source builds.
set(SOURCE_PATH_DEBUG ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-debug/epsilon-0.9.2)
set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-release/epsilon-0.9.2)
-
+file(REMOVE_RECURSE ${SOURCE_PATH_DEBUG} ${SOURCE_PATH_RELEASE}) # to be sure that the patches can be properly applied, we always clean the buildtrees folder
foreach(BUILD_TYPE debug release)
vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE})
vcpkg_apply_patches(
@@ -96,4 +96,3 @@ file(INSTALL ${FILTERS}
vcpkg_copy_pdbs()
file(INSTALL ${SOURCE_PATH_RELEASE}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/epsilon/ RENAME copyright)
message(STATUS "Packaging ${TARGET_TRIPLET} done")
-