diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-04-08 05:12:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-07 14:12:18 -0700 |
| commit | 7d596220f91f9335313aafb926ea495b0b644d9f (patch) | |
| tree | 226ca571843669487d34c9b5378a2256c80a188c | |
| parent | c90db9a65ea7d6d960b77ac23d0d1accca39052b (diff) | |
| download | vcpkg-7d596220f91f9335313aafb926ea495b0b644d9f.tar.gz vcpkg-7d596220f91f9335313aafb926ea495b0b644d9f.zip | |
[wxwidgets] Fix include path in UNIX (#16371)
* [wxwidgets] Fix include path in UNIX
* update version record
| -rw-r--r-- | ports/wxwidgets/portfile.cmake | 11 | ||||
| -rw-r--r-- | ports/wxwidgets/setup.h | 5 | ||||
| -rw-r--r-- | ports/wxwidgets/setup.h.in | 5 | ||||
| -rw-r--r-- | ports/wxwidgets/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/w-/wxwidgets.json | 5 |
6 files changed, 22 insertions, 8 deletions
diff --git a/ports/wxwidgets/portfile.cmake b/ports/wxwidgets/portfile.cmake index 09df407b1..8869d2af0 100644 --- a/ports/wxwidgets/portfile.cmake +++ b/ports/wxwidgets/portfile.cmake @@ -88,7 +88,16 @@ foreach(INC IN LISTS INCLUDES) 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) + file(GLOB_RECURSE WX_SETUP_H_FILES_DBG ${CURRENT_PACKAGES_DIR}/debug/lib/*.h) + file(GLOB_RECURSE WX_SETUP_H_FILES_REL ${CURRENT_PACKAGES_DIR}/lib/*.h) + + string(REPLACE "${CURRENT_PACKAGES_DIR}/debug/lib/" "" WX_SETUP_H_FILES_DBG "${WX_SETUP_H_FILES_DBG}") + string(REPLACE "/setup.h" "" WX_SETUP_H_DBG_RELATIVE "${WX_SETUP_H_FILES_DBG}") + + string(REPLACE "${CURRENT_PACKAGES_DIR}/lib/" "" WX_SETUP_H_FILES_REL "${WX_SETUP_H_FILES_REL}") + string(REPLACE "/setup.h" "" WX_SETUP_H_REL_RELATIVE "${WX_SETUP_H_FILES_REL}") + + configure_file(${CMAKE_CURRENT_LIST_DIR}/setup.h.in ${CURRENT_PACKAGES_DIR}/include/wx/setup.h @ONLY) 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) diff --git a/ports/wxwidgets/setup.h b/ports/wxwidgets/setup.h deleted file mode 100644 index d05b4c5ed..000000000 --- a/ports/wxwidgets/setup.h +++ /dev/null @@ -1,5 +0,0 @@ -#ifdef _DEBUG
-#include "../../debug/lib/mswud/wx/setup.h"
-#else
-#include "../../lib/mswu/wx/setup.h"
-#endif
diff --git a/ports/wxwidgets/setup.h.in b/ports/wxwidgets/setup.h.in new file mode 100644 index 000000000..ad9579727 --- /dev/null +++ b/ports/wxwidgets/setup.h.in @@ -0,0 +1,5 @@ +#ifdef _DEBUG
+#include "../../debug/lib/@WX_SETUP_H_DBG_RELATIVE@/setup.h"
+#else
+#include "../../lib/@WX_SETUP_H_REL_RELATIVE@/setup.h"
+#endif
diff --git a/ports/wxwidgets/vcpkg.json b/ports/wxwidgets/vcpkg.json index dea70c545..1823f252c 100644 --- a/ports/wxwidgets/vcpkg.json +++ b/ports/wxwidgets/vcpkg.json @@ -1,7 +1,7 @@ { "name": "wxwidgets", "version-semver": "3.1.4", - "port-version": 6, + "port-version": 7, "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 a958de7da..ab595daaa 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6422,7 +6422,7 @@ }, "wxwidgets": { "baseline": "3.1.4", - "port-version": 6 + "port-version": 7 }, "x-plane": { "baseline": "3.0.3", diff --git a/versions/w-/wxwidgets.json b/versions/w-/wxwidgets.json index 43ffec5ca..c0f45d844 100644 --- a/versions/w-/wxwidgets.json +++ b/versions/w-/wxwidgets.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "12acbc593b35e2d327b6fc665c8eed6e25745431", + "version-semver": "3.1.4", + "port-version": 7 + }, + { "git-tree": "eed8ba1dc939b1c1a17a05bf409142664015ad4d", "version-semver": "3.1.4", "port-version": 6 |