aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Christensen <philc@microsoft.com>2019-04-04 21:10:53 -0700
committerGitHub <noreply@github.com>2019-04-04 21:10:53 -0700
commit1705134bdd649b340d579c1921446784562923da (patch)
tree70ddaa9982af40a4cd630ed269a1dfccba5076f5
parent0e4c999b21c0ba09eb21fea2722f97c9a6c2ac50 (diff)
downloadvcpkg-1705134bdd649b340d579c1921446784562923da.tar.gz
vcpkg-1705134bdd649b340d579c1921446784562923da.zip
[qca] don't use port dir for temp (#5954)
* [qca] don't use port dir for temp * [qca] bump control version
-rw-r--r--ports/qca/CONTROL2
-rw-r--r--ports/qca/portfile.cmake4
2 files changed, 3 insertions, 3 deletions
diff --git a/ports/qca/CONTROL b/ports/qca/CONTROL
index 72f20869f..4c09bf3b1 100644
--- a/ports/qca/CONTROL
+++ b/ports/qca/CONTROL
@@ -1,4 +1,4 @@
Source: qca
-Version: 2.2.0-3
+Version: 2.2.0-4
Description: Qt Cryptographic Architecture (QCA). Sources: https://cgit.kde.org/qca.git/
Build-Depends: qt5-base
diff --git a/ports/qca/portfile.cmake b/ports/qca/portfile.cmake
index ff667cd6c..55acdc0b6 100644
--- a/ports/qca/portfile.cmake
+++ b/ports/qca/portfile.cmake
@@ -33,12 +33,12 @@ message(STATUS "Importing certstore")
file(REMOVE ${SOURCE_PATH}/certs/rootcerts.pem)
# Using file(DOWNLOAD) to use https
file(DOWNLOAD https://raw.githubusercontent.com/mozilla/gecko-dev/master/security/nss/lib/ckfw/builtins/certdata.txt
- ${CMAKE_CURRENT_LIST_DIR}/certdata.txt
+ ${CURRENT_BUILDTREES_DIR}/cert/certdata.txt
TLS_VERIFY ON
)
vcpkg_execute_required_process(
COMMAND ${PERL} ${CMAKE_CURRENT_LIST_DIR}/mk-ca-bundle.pl -n ${SOURCE_PATH}/certs/rootcerts.pem
- WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
+ WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/cert
LOGNAME ca-bundle
)
message(STATUS "Importing certstore done")