diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-01-30 16:54:26 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-30 16:54:26 -0800 |
| commit | 9c11be336c0a01e1a92b8c47abd4355318afae8f (patch) | |
| tree | a4ca0df7b0f98110610900e5dee7992551a556fc | |
| parent | 4a387a4fd74b843a6a08da3ccfdb0ba223afa208 (diff) | |
| parent | 9e00fb932da0520aabf670478f71a578ad920762 (diff) | |
| download | vcpkg-9c11be336c0a01e1a92b8c47abd4355318afae8f.tar.gz vcpkg-9c11be336c0a01e1a92b8c47abd4355318afae8f.zip | |
Merge pull request #2636 from Godrod/master
Fix missing dlls for wxWidgets
| -rw-r--r-- | ports/wxwidgets/portfile.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 15688264d..a68f71f99 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -96,10 +96,15 @@ file(INSTALL ${SOURCE_PATH}/lib/${LIB_SUB_PATH}-rel/mswu/wx/setup.h DESTINATION file(INSTALL ${SOURCE_PATH}/lib/${LIB_SUB_PATH}-rel/mswu/wx/msw/rcdefs.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/wx/msw) file(INSTALL ${SOURCE_PATH}/lib/${LIB_SUB_PATH}-rel/ DESTINATION ${CURRENT_PACKAGES_DIR}/lib FILES_MATCHING PATTERN "*.lib" PATTERN "*.pdb") +file(INSTALL ${SOURCE_PATH}/lib/${LIB_SUB_PATH}-rel/ + DESTINATION ${CURRENT_PACKAGES_DIR}/bin FILES_MATCHING PATTERN "*.dll") file(INSTALL ${SOURCE_PATH}/lib/${LIB_SUB_PATH}-dbg/ DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib FILES_MATCHING PATTERN "*.lib" PATTERN "*.pdb") +file(INSTALL ${SOURCE_PATH}/lib/${LIB_SUB_PATH}-dbg/ + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin FILES_MATCHING PATTERN "*.dll") file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/mswu ${CURRENT_PACKAGES_DIR}/debug/lib/mswud) - +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/mswu ${CURRENT_PACKAGES_DIR}/debug/bin/mswud) + # Handle copyright file(COPY ${SOURCE_PATH}/docs/licence.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxwidgets) file(RENAME ${CURRENT_PACKAGES_DIR}/share/wxWidgets/licence.txt ${CURRENT_PACKAGES_DIR}/share/wxwidgets/copyright) |
