diff options
| author | Hennadii Zabula <zabulus12@gmail.com> | 2017-06-01 11:54:56 +0300 |
|---|---|---|
| committer | Hennadii Zabula <zabulus12@gmail.com> | 2017-06-01 11:54:56 +0300 |
| commit | 41069b853078ce3ecfb5a66101c62ff84100e02e (patch) | |
| tree | 1b96f7e4caa7eb510088b9a8d5a6815bc2456e66 | |
| parent | 33dd3ee38d2dae173db756beabb9fd2f87bb524c (diff) | |
| download | vcpkg-41069b853078ce3ecfb5a66101c62ff84100e02e.tar.gz vcpkg-41069b853078ce3ecfb5a66101c62ff84100e02e.zip | |
Fix openssl pathlib
| -rw-r--r-- | ports/openssl/fix-uwp-pathlib.patch | 13 | ||||
| -rw-r--r-- | ports/openssl/portfile-uwp.cmake | 7 |
2 files changed, 20 insertions, 0 deletions
diff --git a/ports/openssl/fix-uwp-pathlib.patch b/ports/openssl/fix-uwp-pathlib.patch new file mode 100644 index 000000000..17a1a4e10 --- /dev/null +++ b/ports/openssl/fix-uwp-pathlib.patch @@ -0,0 +1,13 @@ +diff --git "a/ms/setVSvars.bat" "b/ms/setVSvars.bat" +index e6ebc0a7..cde9afb2 100644 +--- "a/ms/setVSvars.bat" ++++ "b/ms/setVSvars.bat" +@@ -179,7 +179,7 @@ exit /b + call:setVar _VS14VC VisualStudio14VC + call:setVar _WKITS10 WindowsKits10.0 + set PATH=%_VS14VCBin%;%PATH% +- set "LIBPATH=%_WKITS10%UnionMetadata\Facade;%_VS14VC%vcpackages;%_WKITS10%references\windows.foundation.foundationcontract\1.0.0.0\;%_WKITS10%references\windows.foundation.universalapicontract\1.0.0.0\" ++ set "LIBPATH=%_WKITS10%UnionMetadata\Facade;%_VS14VC%vcpackages;%_WKITS10%references\windows.foundation.foundationcontract\2.0.0.0\;%_WKITS10%references\windows.foundation.universalapicontract\3.0.0.0\" + goto :eof + + :end diff --git a/ports/openssl/portfile-uwp.cmake b/ports/openssl/portfile-uwp.cmake index cf2f1e7ca..c752f554a 100644 --- a/ports/openssl/portfile-uwp.cmake +++ b/ports/openssl/portfile-uwp.cmake @@ -40,6 +40,13 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive(${ARCHIVE}) +message(STATUS ${SOURCE_PATH}) + +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-uwp-pathlib.patch +) + file(REMOVE_RECURSE ${SOURCE_PATH}/tmp32dll) file(REMOVE_RECURSE ${SOURCE_PATH}/out32dll) file(REMOVE_RECURSE ${SOURCE_PATH}/inc32dll) |