diff options
| author | Vitalii Koshura <lestat.de.lionkur@gmail.com> | 2021-02-11 09:00:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-11 00:00:18 -0800 |
| commit | 551875c5393231fb5d5353b39e7831768f75eb74 (patch) | |
| tree | 0cc49b615566f6e398d93de1f277b3f00bb6c89b | |
| parent | fbd84192fedcb0915b63d3197950e65139d06f16 (diff) | |
| download | vcpkg-551875c5393231fb5d5353b39e7831768f75eb74.tar.gz vcpkg-551875c5393231fb5d5353b39e7831768f75eb74.zip | |
[wxWidgets] Fix issue with port usage (#16154)
Fixed issue when necessary header file was not installed that leaded to this error:
`\vcpkg\installed\x64-windows-static\include\wx\platform.h(160,10): fatal error C1083: Cannot open include file: 'wx/setup.h': No such file or directory`
Also fixed string replace enumeration to include only *.h files because otherwise for some reason *.cur file was messed up.
Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
| -rw-r--r-- | ports/wxwidgets/portfile.cmake | 15 | ||||
| -rw-r--r-- | ports/wxwidgets/setup.h | 5 | ||||
| -rw-r--r-- | ports/wxwidgets/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/w-/wxwidgets.json | 5 |
5 files changed, 22 insertions, 7 deletions
diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 8e13516e5..09df407b1 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -66,13 +66,15 @@ endif() # do the copy pdbs now after the dlls got moved to the expected /bin folder above vcpkg_copy_pdbs() -if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/mswud) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/mswud ${CURRENT_PACKAGES_DIR}/lib/mswud) -endif() - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/msvc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(GLOB_RECURSE INCLUDES ${CURRENT_PACKAGES_DIR}/include/*) +file(GLOB_RECURSE INCLUDES ${CURRENT_PACKAGES_DIR}/include/*.h) +if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h) + list(APPEND INCLUDES ${CURRENT_PACKAGES_DIR}/lib/mswu/wx/setup.h) +endif() +if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h) + list(APPEND INCLUDES ${CURRENT_PACKAGES_DIR}/debug/lib/mswud/wx/setup.h) +endif() foreach(INC IN LISTS INCLUDES) file(READ "${INC}" _contents) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -85,6 +87,9 @@ foreach(INC IN LISTS INCLUDES) file(WRITE "${INC}" "${_contents}") endforeach() +if(NOT EXISTS ${CURRENT_PACKAGES_DIR}/include/wx/setup.h) + file(COPY ${CMAKE_CURRENT_LIST_DIR}/setup.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/wx) +endif() file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/wxwidgets) configure_file(${CMAKE_CURRENT_LIST_DIR}/usage ${CURRENT_PACKAGES_DIR}/share/wxwidgets/usage COPYONLY) file(INSTALL ${SOURCE_PATH}/docs/licence.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/wxwidgets/setup.h b/ports/wxwidgets/setup.h new file mode 100644 index 000000000..d05b4c5ed --- /dev/null +++ b/ports/wxwidgets/setup.h @@ -0,0 +1,5 @@ +#ifdef _DEBUG
+#include "../../debug/lib/mswud/wx/setup.h"
+#else
+#include "../../lib/mswu/wx/setup.h"
+#endif
diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index 49b2fab10..dea70c545 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wxwidgets", "version-semver": "3.1.4", - "port-version": 5, + "port-version": 6, "description": "a widget toolkit and tools library for creating graphical user interfaces (GUIs) for cross-platform applications.", "homepage": "https://github.com/wxWidgets/wxWidgets", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 7a426045d..68ac735c5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6230,7 +6230,7 @@ }, "wxwidgets": { "baseline": "3.1.4", - "port-version": 5 + "port-version": 6 }, "x-plane": { "baseline": "3.0.3", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index 2d87681d0..43ffec5ca 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "eed8ba1dc939b1c1a17a05bf409142664015ad4d", + "version-semver": "3.1.4", + "port-version": 6 + }, + { "git-tree": "c608ed7a8383b93a30bd7894b8bee51b0c53066d", "version-semver": "3.1.4", "port-version": 5 |