Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

Fix error message when looking for PYTHON2

This commit is contained in:
Alexander Karatarakis 2017-01-10 16:02:53 -08:00
parent 9581359bd3
commit 4f5f52ff47
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/fmt/portfile.cmake
View File

@ -31,8 +31,8 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
endif()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE ${CURRENT_PACKAGES_DIR}/include/fmt/format.cc)
file(REMOVE ${CURRENT_PACKAGES_DIR}/include/fmt/ostream.cc)
#file(REMOVE ${CURRENT_PACKAGES_DIR}/include/fmt/format.cc)
#file(REMOVE ${CURRENT_PACKAGES_DIR}/include/fmt/ostream.cc)
file(RENAME ${CURRENT_PACKAGES_DIR}/debug/share/fmt/fmt-targets-debug.cmake ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake)
file(READ ${CURRENT_PACKAGES_DIR}/share/fmt/fmt-targets-debug.cmake FMT_DEBUG_MODULE)
string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" FMT_DEBUG_MODULE "${FMT_DEBUG_MODULE}")

3
scripts/cmake/vcpkg_find_acquire_program.cmake
View File

@ -46,8 +46,7 @@ function(vcpkg_find_acquire_program VAR)
endif()
endif()
if(PYTHON2 MATCHES "NOTFOUND")
message(FATAL_ERROR "libuv uses the GYP build system, which requires Python 2.7.\n"
"Python 2.7 was not found in the path or by searching inside C:\\Python27.\n"
message(FATAL_ERROR "Python 2.7 was not found in the path or by searching inside C:\\Python27.\n"
"There is no portable redistributable for Python 2.7, so you will need to install the MSI located at:\n"
" https://www.python.org/ftp/python/2.7.11/python-2.7.11.amd64.msi\n"
)