diff options
| author | Andrew Gunnerson <chillermillerlong@hotmail.com> | 2019-09-29 19:35:00 -0400 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-09-29 16:35:00 -0700 |
| commit | 4235c216ac3516152366dd1bedda694e62a1375d (patch) | |
| tree | b1a8e0480aa9dff202a2a698af872af4872b74e2 | |
| parent | 1944bcf8b1bb6e1104a95b35a7f02d8e382bf624 (diff) | |
| download | vcpkg-4235c216ac3516152366dd1bedda694e62a1375d.tar.gz vcpkg-4235c216ac3516152366dd1bedda694e62a1375d.zip | |
[libplist,libusbmuxd] Set ONLY_DYNAMIC_LIBRARY instead of ONLY_STATIC_LIBRARY (#8392)
* [libplist] Set ONLY_DYNAMIC_LIBRARY instead of ONLY_STATIC_LIBRARY
libplist appears to always build as a dynamic library and the previous
ONLY_STATIC_LIBRARY option was causing the DLLs to not be installed.
Signed-off-by: Andrew Gunnerson <andrewgunnerson@gmail.com>
* [libusbmuxd] Set ONLY_DYNAMIC_LIBRARY instead of ONLY_STATIC_LIBRARY
libusbmuxd also always builds as a dynamic library (like libplist).
Signed-off-by: Andrew Gunnerson <andrewgunnerson@gmail.com>
* [libplist] Ensure app container bit is set for UWP DLLs
Signed-off-by: Andrew Gunnerson <andrewgunnerson@gmail.com>
| -rw-r--r-- | ports/libplist/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/libusbmuxd/portfile.cmake | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ports/libplist/portfile.cmake b/ports/libplist/portfile.cmake index 5b6ce749c..b2b8dde80 100644 --- a/ports/libplist/portfile.cmake +++ b/ports/libplist/portfile.cmake @@ -1,6 +1,6 @@ include(vcpkg_common_functions)
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
+vcpkg_check_linkage(ONLY_DYNAMIC_CRT ONLY_DYNAMIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
@@ -14,6 +14,10 @@ vcpkg_from_github( set(ENV{_CL_} "$ENV{_CL_} /GL-")
set(ENV{_LINK_} "$ENV{_LINK_} /LTCG:OFF")
+if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+ set(ENV{_LINK_} "$ENV{_LINK_} /APPCONTAINER")
+endif()
+
vcpkg_install_msbuild(
SOURCE_PATH ${SOURCE_PATH}
PROJECT_SUBPATH libplist.sln
diff --git a/ports/libusbmuxd/portfile.cmake b/ports/libusbmuxd/portfile.cmake index 9a03b5e53..d02ca0768 100644 --- a/ports/libusbmuxd/portfile.cmake +++ b/ports/libusbmuxd/portfile.cmake @@ -1,6 +1,6 @@ include(vcpkg_common_functions)
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
+vcpkg_check_linkage(ONLY_DYNAMIC_CRT ONLY_DYNAMIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
|