diff options
| author | charlie barto <charlie barto> | 2016-11-15 22:44:53 -0500 |
|---|---|---|
| committer | Charlie Barto <bartoc@umich.edu> | 2016-12-02 12:19:18 -0500 |
| commit | 67303f15690629053d8a6191665131fde5829f73 (patch) | |
| tree | ea2532fb334bc6acb2cab4d488e8a7ac2c35cc10 /ports/qt5 | |
| parent | 79399923b6cd98b9e77020615e433ef0560d5dc2 (diff) | |
| download | vcpkg-67303f15690629053d8a6191665131fde5829f73.tar.gz vcpkg-67303f15690629053d8a6191665131fde5829f73.zip | |
Added libpq support to qt5
qt5 changes
more qt5 changes
added libpq to qt5
fix merge
fixed left over git thing
Diffstat (limited to 'ports/qt5')
| -rw-r--r-- | ports/qt5/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qt5/portfile.cmake | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL index accc2ba07..e38a2c835 100644 --- a/ports/qt5/CONTROL +++ b/ports/qt5/CONTROL @@ -1,4 +1,4 @@ Source: qt5 Version: 5.7-1 -Build-Depends: Description: Qt5 application framework main components. Webengine, examples and tests not included. +Build-Depends: sqlite3, libpq
\ No newline at end of file diff --git a/ports/qt5/portfile.cmake b/ports/qt5/portfile.cmake index 85ebb107b..3cc3a17bb 100644 --- a/ports/qt5/portfile.cmake +++ b/ports/qt5/portfile.cmake @@ -13,7 +13,8 @@ get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY) get_filename_component(PYTHON3_EXE_PATH ${PYTHON3} DIRECTORY) get_filename_component(JOM_EXE_PATH ${JOM} DIRECTORY) set(ENV{PATH} "${JOM_EXE_PATH};${PYTHON3_EXE_PATH};${PERL_EXE_PATH};$ENV{PATH}") - +set(ENV{INCLUDE} "${CURRENT_INSTALLED_DIR}/include;$ENV{INCLUDE}") +set(ENV{LIB} "${CURRENT_INSTALLED_DIR}/lib;$ENV{LIB}") vcpkg_download_distfile(ARCHIVE_FILE URLS "http://download.qt.io/official_releases/qt/5.7/5.7.0/single/qt-everywhere-opensource-src-5.7.0.7z" FILENAME "qt-5.7.0.7z" @@ -44,7 +45,11 @@ vcpkg_execute_required_process( COMMAND "${SOURCE_PATH}/configure.bat" -confirm-license -opensource -platform win32-msvc2015 -debug-and-release -force-debug-info ${QT_RUNTIME_LINKAGE} + -qt-zlib + -qt-libjpeg + -system-sqlite -nomake examples -nomake tests -skip webengine + -qt-sql-sqlite -qt-sql-psql -prefix ${CURRENT_PACKAGES_DIR} -bindir ${CURRENT_PACKAGES_DIR}/bin -hostbindir ${CURRENT_PACKAGES_DIR}/tools @@ -67,7 +72,7 @@ message(STATUS "Build ${TARGET_TRIPLET} done") message(STATUS "Installing ${TARGET_TRIPLET}") vcpkg_execute_required_process( - COMMAND ${JOM} install + COMMAND ${JOM} -j1 install WORKING_DIRECTORY ${OUTPUT_PATH} LOGNAME install-${TARGET_TRIPLET} ) @@ -151,3 +156,4 @@ vcpkg_execute_required_process( file(INSTALL ${SOURCE_PATH}/LICENSE.LGPLv3 DESTINATION ${CURRENT_PACKAGES_DIR}/share/qt5 RENAME copyright) vcpkg_copy_pdbs() + |