aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-09-07 14:38:33 -0700
committerGitHub <noreply@github.com>2017-09-07 14:38:33 -0700
commit802bba0a751a1684080c0da0e1835adaf6082c51 (patch)
treeaaa434359e1853e9ac4eaf7d48dde9f1a228abbe
parent73dc1999dced5fe26a714c3b20058dc7ade93432 (diff)
parentf1c220d7232f90ff5ac5f51dc384d0aed45c5c3f (diff)
downloadvcpkg-802bba0a751a1684080c0da0e1835adaf6082c51.tar.gz
vcpkg-802bba0a751a1684080c0da0e1835adaf6082c51.zip
Merge pull request #1779 from OlafvdSpek/master
Update ctemplate, use Python 3
-rw-r--r--ports/ctemplate/portfile.cmake15
1 files changed, 4 insertions, 11 deletions
diff --git a/ports/ctemplate/portfile.cmake b/ports/ctemplate/portfile.cmake
index af1f0532c..d22c3afa4 100644
--- a/ports/ctemplate/portfile.cmake
+++ b/ports/ctemplate/portfile.cmake
@@ -1,27 +1,20 @@
include(vcpkg_common_functions)
-set(GIT_REF 44b7c5b918a08ad561c63e9d28beecb40c10ebca)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO OlafvdSpek/ctemplate
- REF 44b7c5b918a08ad561c63e9d28beecb40c10ebca
- SHA512 b572f6d0d182e977d3a459e68bde6244dad7196c44c16407990dc1fb6a7a93bcd8d6851e515d50b6051c1d011f71695f895f6ab233664baadae0bf6a3d464305
+ REF 4b7e6c52dc7cbb4d51c9abcebcbac91ec256a62b
+ SHA512 9317fb26f22892b0bc2ca17cbccb5b084091050aa88766b4ed673a690bc4cdb9cd882134fbcd7ed3ee156f6a6937218717765143796d7e98b532355867ed042b
HEAD_REF master
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-vcpkg_find_acquire_program(PYTHON2)
-
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
- PATCHES
- ${CMAKE_CURRENT_LIST_DIR}/fix-msvc.patch
-)
+vcpkg_find_acquire_program(PYTHON3)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
- OPTIONS -DPYTHON_EXECUTABLE=${PYTHON2}
+ OPTIONS -DPYTHON_EXECUTABLE=${PYTHON3}
OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
)