diff options
| author | bagong <rs@bagong.de> | 2017-07-03 02:04:19 +0200 |
|---|---|---|
| committer | bagong <rs@bagong.de> | 2017-07-03 02:04:19 +0200 |
| commit | 7367278356eec0d528e767b427b9f08322350888 (patch) | |
| tree | a57fbca209a2a9bb1e35942678faf819abe5cda8 | |
| parent | 144d3718c4197b101c7d61ee6a258200371fb1ab (diff) | |
| download | vcpkg-7367278356eec0d528e767b427b9f08322350888.tar.gz vcpkg-7367278356eec0d528e767b427b9f08322350888.zip | |
Fix and enhance qscintilla build
| -rw-r--r-- | ports/qscintilla/CONTROL | 4 | ||||
| -rw-r--r-- | ports/qscintilla/portfile.cmake | 36 |
2 files changed, 30 insertions, 10 deletions
diff --git a/ports/qscintilla/CONTROL b/ports/qscintilla/CONTROL index bcdde0e37..22a30137c 100644 --- a/ports/qscintilla/CONTROL +++ b/ports/qscintilla/CONTROL @@ -1,4 +1,4 @@ Source: qscintilla -Version: 2.10 -Description: QScintilla is a port to Qt of the Scintilla editing component. Features syntax highlighting, code-completion and much more (Barebone build without python bindings (missing dependeny PyQt)) +Version: 2.10-1 +Description: QScintilla is a port to Qt of the Scintilla editing component. Features syntax highlighting, code-completion and much more (Barebone build without python bindings (missing dependeny PyQt) and without QtDesigner plugin) Build-Depends: qt5 diff --git a/ports/qscintilla/portfile.cmake b/ports/qscintilla/portfile.cmake index 047868ee8..ca8204398 100644 --- a/ports/qscintilla/portfile.cmake +++ b/ports/qscintilla/portfile.cmake @@ -25,41 +25,61 @@ vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON_PATH ${PYTHON3} DIRECTORY) SET(ENV{PATH} "${PYTHON_PATH};$ENV{PATH}") +set(BUILD_OPTIONS + "${SOURCE_PATH}/Qt4Qt5/qscintilla.pro" + CONFIG+=build_all + CONFIG-=hide_symbols +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(BUILD_OPTIONS + ${BUILD_OPTIONS} + CONFIG+=staticlib + ) +endif() + vcpkg_configure_qmake( SOURCE_PATH "${SOURCE_PATH}/Qt4Qt5" OPTIONS - CONFIG+=build_all - CONFIG-=hide_symbols + ${BUILD_OPTIONS} ) vcpkg_build_qmake() -# Install following vcpkg conventions (following qwt portfile) set(BUILD_DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}) -file(GLOB HEADER_FILES ${SOURCE_PATH}/include/*) -file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/qscintilla) +file(GLOB HEADER_FILES ${SOURCE_PATH}/Qt4Qt5/Qsci/*) +file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/Qsci) file(INSTALL ${BUILD_DIR}/release/qscintilla2_qt5.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib + RENAME qscintilla2.lib ) file(INSTALL ${BUILD_DIR}/debug/qscintilla2_qt5.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib + RENAME qscintilla2.lib ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(INSTALL - ${BUILD_DIR}/release/qscintilla2_qt5.dll - DESTINATION ${CURRENT_PACKAGES_DIR}/bin + file(INSTALL + ${BUILD_DIR}/release/qscintilla2_qt5.dll + DESTINATION ${CURRENT_PACKAGES_DIR}/bin + RENAME qscintilla2.dll ) file(INSTALL ${BUILD_DIR}/debug/qscintilla2_qt5.dll + DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin + RENAME qscintilla2.dll + ) + + file(INSTALL ${BUILD_DIR}/debug/qscintilla2_qt5.pdb DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin + RENAME qscintilla2.pdb ) endif() |