From 9ddc9173d7858ddb40b2fc0cdc73b529c390ba47 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Wed, 6 Jan 2021 23:30:36 -0500 Subject: [vcpkg baseline][cppcms] Fix issue with detecting Python 2. (#15473) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [cppcms] Fix issue with detecting Python 2. * Update ports/cppcms/portfile.cmake Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> --- ports/cppcms/CONTROL | 3 ++- ports/cppcms/portfile.cmake | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'ports/cppcms') diff --git a/ports/cppcms/CONTROL b/ports/cppcms/CONTROL index 2acc51fdf..2d4f63095 100644 --- a/ports/cppcms/CONTROL +++ b/ports/cppcms/CONTROL @@ -1,5 +1,6 @@ Source: cppcms -Version: 1.2.1-1 +Version: 1.2.1 +Port-Version: 2 Homepage: https://github.com/artyom-beilis/cppcms Description: CppCMS is a Free High Performance Web Development Framework (not a CMS) aimed at Rapid Web Application Development Build-Depends: icu, pcre, openssl, zlib diff --git a/ports/cppcms/portfile.cmake b/ports/cppcms/portfile.cmake index 383022fab..d25c1b18e 100644 --- a/ports/cppcms/portfile.cmake +++ b/ports/cppcms/portfile.cmake @@ -10,12 +10,13 @@ vcpkg_from_github( ) vcpkg_find_acquire_program(PYTHON2) -get_filename_component(PYTHON2_DIR ${PYTHON2} DIRECTORY) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DCMAKE_PROGRAM_PATH=${PYTHON2_DIR} -DUSE_WINDOWS6_API=ON + OPTIONS + -DPYTHON=${PYTHON2} # Switch to python3 on the next update + -DUSE_WINDOWS6_API=ON ) vcpkg_install_cmake() -- cgit v1.2.3