diff options
| author | Phoebe <20694052+PhoebeHui@users.noreply.github.com> | 2020-01-10 07:18:40 +0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2020-01-09 15:18:40 -0800 |
| commit | 1540a0db42fbb69112d84bbf3e78bfa4021cdee6 (patch) | |
| tree | 8269062174d212e902533d5d8663d4588904394d /ports/msix/install-cmake.patch | |
| parent | b5344cab1bba59e0cf6ae8e64ad3e0823bae7c75 (diff) | |
| download | vcpkg-1540a0db42fbb69112d84bbf3e78bfa4021cdee6.tar.gz vcpkg-1540a0db42fbb69112d84bbf3e78bfa4021cdee6.zip | |
[msix] upgrade to 1.7 (#8934)
Diffstat (limited to 'ports/msix/install-cmake.patch')
| -rw-r--r-- | ports/msix/install-cmake.patch | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/ports/msix/install-cmake.patch b/ports/msix/install-cmake.patch index d33613ae6..e8f930f61 100644 --- a/ports/msix/install-cmake.patch +++ b/ports/msix/install-cmake.patch @@ -1,19 +1,20 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8ee0443..8c0a868 100644
+index 20098bf..38c3c95 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -266,3 +266,5 @@ message(STATUS "sample processed")
- add_subdirectory(test)
- message(STATUS "tests processed")
+@@ -190,3 +190,5 @@ message(STATUS "src processed")
+ add_subdirectory(sample)
+ message(STATUS "sample processed")
message(STATUS "DONE!")
+
+install(TARGETS msix)
+\ No newline at end of file
diff --git a/src/msix/CMakeLists.txt b/src/msix/CMakeLists.txt
-index 817040b..6b16b69 100644
+index 296eda4..cf87993 100644
--- a/src/msix/CMakeLists.txt
+++ b/src/msix/CMakeLists.txt
-@@ -164,9 +164,9 @@ message(STATUS "PAL: Compression = ${CompressionObject}")
- include(msix_resources)
+@@ -87,9 +87,9 @@ endif()
+ include(msix_resources) # Handles all the certificates and schemas we are going to use.
set(LIB_PUBLIC_HEADERS
- ../inc/AppxPackaging.hpp
@@ -24,4 +25,13 @@ index 817040b..6b16b69 100644 + ${CMAKE_CURRENT_SOURCE_DIR}/../inc/MsixErrors.hpp
)
- # Bundle specific files
+ set(MsixSrc) # list with all the files we are going to use
+@@ -260,7 +260,7 @@ if(WIN32)
+ "/DELAYLOAD:api-ms-win-core-winrt-l1-1-0.dll")
+ string(REPLACE ";" " " DELAYFLAGS "${DELAYFLAGS}")
+ set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS "${DELAYFLAGS} /LTCG")
+- set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS " /DEF:windowsexports.def")
++ set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS " /DEF:${CMAKE_CURRENT_BINARY_DIR}/windowsexports.def")
+ if(USE_STATIC_MSVC)
+ if(CMAKE_BUILD_TYPE MATCHES Debug)
+ set_property(TARGET ${PROJECT_NAME} APPEND_STRING PROPERTY LINK_FLAGS " /NODEFAULTLIB:MSVCRTD")
|