diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-05-21 21:00:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-21 21:00:24 -0700 |
| commit | 33af90d42af68ef343edb00a69b1e11548a9e2e1 (patch) | |
| tree | c338f44bd8a960e8eafc52b91f6a1f666a927512 /ports/msix/install-cmake.patch | |
| parent | e16f9c29a05aa178ce8a476a293723ab92f08f89 (diff) | |
| download | vcpkg-33af90d42af68ef343edb00a69b1e11548a9e2e1.tar.gz vcpkg-33af90d42af68ef343edb00a69b1e11548a9e2e1.zip | |
[many ports] Updates 2019.05.19 (#6524)
Diffstat (limited to 'ports/msix/install-cmake.patch')
| -rw-r--r-- | ports/msix/install-cmake.patch | 50 |
1 files changed, 21 insertions, 29 deletions
diff --git a/ports/msix/install-cmake.patch b/ports/msix/install-cmake.patch index e44cc9b3c..d33613ae6 100644 --- a/ports/msix/install-cmake.patch +++ b/ports/msix/install-cmake.patch @@ -1,35 +1,27 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8ee0443..8c0a868 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -266,3 +266,5 @@ message(STATUS "sample processed")
+ add_subdirectory(test)
+ message(STATUS "tests processed")
+ message(STATUS "DONE!")
++
++install(TARGETS msix)
diff --git a/src/msix/CMakeLists.txt b/src/msix/CMakeLists.txt
-index 586c140..41a24ae 100644
+index 817040b..6b16b69 100644
--- a/src/msix/CMakeLists.txt
+++ b/src/msix/CMakeLists.txt
-@@ -129,6 +129,17 @@ set(LIB_SOURCES
- # Define the library
- add_library(${LIBRARY_NAME} SHARED ${LIB_SOURCES} ${LIB_PUBLIC_HEADERS} ${LIB_PRIVATE_HEADERS})
-
-+if(INSTALL_LIBMSIX)
-+ install(TARGETS ${LIBRARY_NAME}
-+ RUNTIME DESTINATION bin
-+ LIBRARY DESTINATION lib
-+ ARCHIVE DESTINATION lib
-+ )
-+ if(INSTALL_HEADERS)
-+ install(FILES ${LIB_PUBLIC_HEADERS} DESTINATION include)
-+ endif()
-+endif()
-+
- # specify that this library is to be built with C++14
- set_property(TARGET ${LIBRARY_NAME} PROPERTY CXX_STANDARD 14)
+@@ -164,9 +164,9 @@ message(STATUS "PAL: Compression = ${CompressionObject}")
+ include(msix_resources)
-@@ -149,8 +160,10 @@ include_directories(
- ${CMAKE_PROJECT_ROOT}/lib/xerces/src
+ set(LIB_PUBLIC_HEADERS
+- ../inc/AppxPackaging.hpp
+- ../inc/MSIXWindows.hpp
+- ../inc/MsixErrors.hpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/../inc/AppxPackaging.hpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/../inc/MSIXWindows.hpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/../inc/MsixErrors.hpp
)
--target_link_libraries(${PROJECT_NAME} PRIVATE zlibstatic)
--target_link_libraries(${PROJECT_NAME} PRIVATE xerces-c)
-+find_package(ZLIB REQUIRED)
-+find_package(XercesC REQUIRED)
-+target_link_libraries(${PROJECT_NAME} PRIVATE ZLIB::ZLIB)
-+target_link_libraries(${PROJECT_NAME} PRIVATE XercesC::XercesC)
-
- IF(AOSP)
- target_link_libraries(${PROJECT_NAME} PRIVATE -latomic)
+ # Bundle specific files
|