3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-14 13:08:00 +08:00
Code Issues Projects Releases Wiki Activity

[qt-base] Use opengl dynamic configuration (#6503)

Browse Source 
* Use dynmaic

* Rename flex and bison so qt angle finds them

* Update CONTROL file

* Remove debugging

* Tempdir for flex and bison

* Remove debug output

* Windows only
This commit is contained in:
Andreas Mack 2019-05-23 00:54:53 +02:00 committed by Victor Romero
parent ef2d3ff6d0
commit 07fd30c6d9
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/qt5-base/CONTROL
View File

@ -1,4 +1,4 @@
Source: qt5-base
Version: 5.12.3
Version: 5.12.3-1
Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl

16
ports/qt5-base/install_qt.cmake
View File

@ -26,7 +26,21 @@ function(install_qt)
vcpkg_find_acquire_program(PYTHON3)
get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY)
vcpkg_add_to_path(PREPEND "${PYTHON3_EXE_PATH}")
set(_path "$ENV{PATH}")
if (CMAKE_HOST_WIN32)
# flex and bison for ANGLE library
vcpkg_find_acquire_program(FLEX)
get_filename_component(FLEX_EXE_PATH ${FLEX} DIRECTORY)
get_filename_component(FLEX_DIR ${FLEX_EXE_PATH} NAME)
file(COPY ${FLEX_EXE_PATH} DESTINATION "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tools" )
set(FLEX_TEMP "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-tools/${FLEX_DIR}")
file(RENAME "${FLEX_TEMP}/win_bison.exe" "${FLEX_TEMP}/bison.exe")
file(RENAME "${FLEX_TEMP}/win_flex.exe" "${FLEX_TEMP}/flex.exe")
vcpkg_add_to_path("${FLEX_TEMP}")
endif()
set(_path "$ENV{PATH}")
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
message(STATUS "Package ${TARGET_TRIPLET}-dbg")

2
ports/qt5-base/portfile.cmake
View File

@ -69,7 +69,7 @@ if(NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore
OPTIONS
${CORE_OPTIONS}
-mp
-opengl desktop # other options are "-no-opengl", "-opengl angle", and "-opengl desktop"
-opengl dynamic # other options are "-no-opengl", "-opengl angle", and "-opengl desktop"
OPTIONS_RELEASE
LIBJPEG_LIBS="-ljpeg"
ZLIB_LIBS="-lzlib"