Merge pull request #1385 from bagong/qscintilla-fix

Fix and enhance qscintilla build
This commit is contained in:
Robert Schumacher 2017-07-06 18:26:41 -07:00 committed by GitHub
commit 0afe1112c1
2 changed files with 26 additions and 11 deletions

View File

@ -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

View File

@ -25,42 +25,57 @@ 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
)
file(INSTALL
${BUILD_DIR}/debug/qscintilla2_qt5.dll
${BUILD_DIR}/debug/qscintilla2_qt5.pdb
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
)
vcpkg_copy_pdbs()
endif()
# Handle copyright