diff options
| author | Andreas Mack <andreas.mack@gmail.com> | 2019-05-23 00:54:53 +0200 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2019-05-22 15:54:53 -0700 |
| commit | 07fd30c6d96dc6833de05b87b76a599444b017ef (patch) | |
| tree | 5f946885762b21123b387324c98ffa56166a0b6f | |
| parent | ef2d3ff6d0c3cfc5754a640d0929d25aa13b4e14 (diff) | |
| download | vcpkg-07fd30c6d96dc6833de05b87b76a599444b017ef.tar.gz vcpkg-07fd30c6d96dc6833de05b87b76a599444b017ef.zip | |
[qt-base] Use opengl dynamic configuration (#6503)
* 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
| -rw-r--r-- | ports/qt5-base/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qt5-base/install_qt.cmake | 16 | ||||
| -rw-r--r-- | ports/qt5-base/portfile.cmake | 2 |
3 files changed, 17 insertions, 3 deletions
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 2d8f1d105..8ad87a0ae 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -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
diff --git a/ports/qt5-base/install_qt.cmake b/ports/qt5-base/install_qt.cmake index a67962200..4eed6cbe5 100644 --- a/ports/qt5-base/install_qt.cmake +++ b/ports/qt5-base/install_qt.cmake @@ -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") diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake index c6dc55e43..47d6ce2e7 100644 --- a/ports/qt5-base/portfile.cmake +++ b/ports/qt5-base/portfile.cmake @@ -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" |