diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-10-07 19:35:13 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-10-07 10:35:13 -0700 |
| commit | 726c11148105a97aef39bec024fdb7c140b1b154 (patch) | |
| tree | 26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/pqp | |
| parent | e86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff) | |
| download | vcpkg-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/pqp')
| -rw-r--r-- | ports/pqp/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | ports/pqp/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pqp/fix-math-functions.patch | 6 | ||||
| -rw-r--r-- | ports/pqp/portfile.cmake | 12 |
4 files changed, 13 insertions, 16 deletions
diff --git a/ports/pqp/CMakeLists.txt b/ports/pqp/CMakeLists.txt index e46f17895..dab50802f 100644 --- a/ports/pqp/CMakeLists.txt +++ b/ports/pqp/CMakeLists.txt @@ -1,12 +1,13 @@ cmake_minimum_required(VERSION 3.0) project(pqp) -include_directories(${SOURCE}/src) +set(SOURCE_CUSTOM_DIR "PQP_v1.3") +include_directories(${SOURCE_CUSTOM_DIR}/src) file(GLOB SRCS - "${SOURCE}/src/*.cpp") + "${SOURCE_CUSTOM_DIR}/src/*.cpp") file(GLOB HDRS - "${SOURCE}/src/*.h") + "${SOURCE_CUSTOM_DIR}/src/*.h") add_library(pqp STATIC ${SRCS}) @@ -18,4 +19,4 @@ install(TARGETS pqp EXPORT pqpConfig foreach (file ${HDRS}) get_filename_component(dir ${file} DIRECTORY) install(FILES ${file} DESTINATION include/ CONFIGURATIONS Release) -endforeach()
\ No newline at end of file +endforeach() diff --git a/ports/pqp/CONTROL b/ports/pqp/CONTROL index 35986cf9f..8525cacbf 100644 --- a/ports/pqp/CONTROL +++ b/ports/pqp/CONTROL @@ -1,4 +1,4 @@ Source: pqp
-Version: 1.3-3
+Version: 1.3-4
Homepage: https://gamma.cs.unc.edu/SSV/
Description: a proximity query package
diff --git a/ports/pqp/fix-math-functions.patch b/ports/pqp/fix-math-functions.patch index 6f81d1b2e..51a4f15d5 100644 --- a/ports/pqp/fix-math-functions.patch +++ b/ports/pqp/fix-math-functions.patch @@ -1,7 +1,5 @@ -diff --git a/src/PQP_Compile.h b/src/PQP_Compile.h -index f76c981..8a70710 100644 ---- a/src/PQP_Compile.h -+++ b/src/PQP_Compile.h +--- a/PQP_v1.3/src/PQP_Compile.h ++++ b/PQP_v1.3/src/PQP_Compile.h @@ -44,10 +44,10 @@ // prevents compiler warnings when PQP_REAL is float diff --git a/ports/pqp/portfile.cmake b/ports/pqp/portfile.cmake index a674e3af3..56b36a0ff 100644 --- a/ports/pqp/portfile.cmake +++ b/ports/pqp/portfile.cmake @@ -2,17 +2,17 @@ include(vcpkg_common_functions) vcpkg_check_linkage(ONLY_STATIC_LIBRARY) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/pqp-1.3/PQP_v1.3) vcpkg_download_distfile(ARCHIVE URLS "http://gamma.cs.unc.edu/software/downloads/SSV/pqp-1.3.tar.gz" FILENAME "pqp-1.3.tar.gz" SHA512 baad7b050b13a6d13de5110cdec443048a3543b65b0d3b30d1b5f737b46715052661f762ef71345d39978c0c788a30a3a935717664806b4729722ee3594ebdc1 ) -vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/fix-math-functions.patch" +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} + PATCHES + fix-math-functions.patch ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) @@ -20,8 +20,6 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS - -DSOURCE=${SOURCE_PATH} ) vcpkg_install_cmake() |