mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
[qtbase] Fix configuration race (#28155)
This commit is contained in:
parent
802998e89d
commit
d7c68eea38
@ -11,10 +11,3 @@ index db48f79b9..4b1686132 100644
|
||||
list(APPEND CMAKE_REQUIRED_LIBRARIES "${EGL_LIBRARY}")
|
||||
list(APPEND CMAKE_REQUIRED_INCLUDES "${EGL_INCLUDE_DIR}")
|
||||
list(APPEND CMAKE_REQUIRED_DEFINITIONS "${EGL_DEFINITIONS}")
|
||||
@@ -134,5 +134,5 @@ if(EGL_INCLUDE_DIR)
|
||||
}" HAVE_EGL)
|
||||
-
|
||||
+file(COPY "${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log" DESTINATION "${CMAKE_BINARY_DIR}/..")
|
||||
cmake_pop_check_state()
|
||||
|
||||
set(required_vars EGL_INCLUDE_DIR HAVE_EGL)
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "qtbase",
|
||||
"version": "6.4.1",
|
||||
"port-version": 1,
|
||||
"port-version": 2,
|
||||
"description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
|
||||
"homepage": "https://www.qt.io/",
|
||||
"license": null,
|
||||
|
@ -6270,7 +6270,7 @@
|
||||
},
|
||||
"qtbase": {
|
||||
"baseline": "6.4.1",
|
||||
"port-version": 1
|
||||
"port-version": 2
|
||||
},
|
||||
"qtcharts": {
|
||||
"baseline": "6.4.1",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "7fa87eeff71c2069b1d7e042ddcb7cec126050e8",
|
||||
"version": "6.4.1",
|
||||
"port-version": 2
|
||||
},
|
||||
{
|
||||
"git-tree": "b00638e59f08a7f585f126cdad6f356f59268c63",
|
||||
"version": "6.4.1",
|
||||
|
Loading…
x
Reference in New Issue
Block a user