mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 12:06:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Qscintilla Namespace Fix (#4332)

Browse Source 
* fix da qt5

* fix qt config duplication

* [qt5-base] Use vcpkg_extract_source_archive_ex
[sqlite3] Enable SQLITE_ENABLE_COLUMN_METADATA

* define SCI_NAMESPACE for qscintilla port

* [qscintilla] Bump control version

* [qscintilla] Fix spacing. Slightly modernize.
This commit is contained in:
Robert Colton 2018-10-25 15:01:44 -04:00 committed by Robert Schumacher
parent a4403276a2
commit 03f4ab3808
2 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/qscintilla/CONTROL
View File

@ -1,4 +1,4 @@
Source: qscintilla Source: qscintilla
Version: 2.10-5 Version: 2.10-7
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) 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-base Build-Depends: qt5-base

31
ports/qscintilla/portfile.cmake
View File

@ -11,15 +11,9 @@ vcpkg_find_acquire_program(PYTHON3)
# Add python3 to path # Add python3 to path
get_filename_component(PYTHON_PATH ${PYTHON3} DIRECTORY) get_filename_component(PYTHON_PATH ${PYTHON3} DIRECTORY)
SET(ENV{PATH} "${PYTHON_PATH};$ENV{PATH}") vcpkg_add_to_path(PREPEND ${PYTHON_PATH})
vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/bin)
set(BUILD_OPTIONS vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/debug/bin)
"${SOURCE_PATH}/Qt4Qt5/qscintilla.pro"
CONFIG+=build_all
CONFIG-=hide_symbols
)
SET(ENV{PATH} "$ENV{PATH};${CURRENT_INSTALLED_DIR}/bin;${CURRENT_INSTALLED_DIR}/debug/bin")
#Store build paths #Store build paths
set(DEBUG_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") set(DEBUG_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
@ -30,6 +24,7 @@ vcpkg_configure_qmake(
OPTIONS OPTIONS
CONFIG+=build_all CONFIG+=build_all
CONFIG-=hide_symbols CONFIG-=hide_symbols
DEFINES+=SCI_NAMESPACE
) )
vcpkg_build_qmake( vcpkg_build_qmake(
@ -38,27 +33,27 @@ vcpkg_build_qmake(
) )
file(GLOB HEADER_FILES ${SOURCE_PATH}/Qt4Qt5/Qsci/*) file(GLOB HEADER_FILES ${SOURCE_PATH}/Qt4Qt5/Qsci/*)
file(INSTALL ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/Qsci) file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/Qsci)
file(INSTALL configure_file(
${RELEASE_DIR}/release/qscintilla2_qt5.lib ${RELEASE_DIR}/release/qscintilla2_qt5.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/lib ${CURRENT_PACKAGES_DIR}/lib/qscintilla2.lib
RENAME qscintilla2.lib COPYONLY
) )
file(INSTALL configure_file(
${DEBUG_DIR}/debug/qscintilla2_qt5.lib ${DEBUG_DIR}/debug/qscintilla2_qt5.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib ${CURRENT_PACKAGES_DIR}/debug/lib/qscintilla2.lib
RENAME qscintilla2.lib COPYONLY
) )
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
file(INSTALL file(COPY
${RELEASE_DIR}/release/qscintilla2_qt5.dll ${RELEASE_DIR}/release/qscintilla2_qt5.dll
DESTINATION ${CURRENT_PACKAGES_DIR}/bin DESTINATION ${CURRENT_PACKAGES_DIR}/bin
) )
file(INSTALL file(COPY
${DEBUG_DIR}/debug/qscintilla2_qt5.dll ${DEBUG_DIR}/debug/qscintilla2_qt5.dll
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
) )