diff options
| author | Robert Colton <robertbcolton@gmail.com> | 2018-10-25 15:01:44 -0400 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-10-25 12:01:44 -0700 |
| commit | 03f4ab3808f90ebc1d3f99b86341d71748eb7364 (patch) | |
| tree | 33f29e1ca8e1e93daeb1ca4977ac4b40ded54187 | |
| parent | a4403276a26ff231f5cb84ffd867df69aaf610ec (diff) | |
| download | vcpkg-03f4ab3808f90ebc1d3f99b86341d71748eb7364.tar.gz vcpkg-03f4ab3808f90ebc1d3f99b86341d71748eb7364.zip | |
Qscintilla Namespace Fix (#4332)
* 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.
| -rw-r--r-- | ports/qscintilla/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qscintilla/portfile.cmake | 31 |
2 files changed, 14 insertions, 19 deletions
diff --git a/ports/qscintilla/CONTROL b/ports/qscintilla/CONTROL index ec8fcbbf4..59b75c8c1 100644 --- a/ports/qscintilla/CONTROL +++ b/ports/qscintilla/CONTROL @@ -1,4 +1,4 @@ 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) Build-Depends: qt5-base diff --git a/ports/qscintilla/portfile.cmake b/ports/qscintilla/portfile.cmake index 18ff18a97..71778e402 100644 --- a/ports/qscintilla/portfile.cmake +++ b/ports/qscintilla/portfile.cmake @@ -11,15 +11,9 @@ vcpkg_find_acquire_program(PYTHON3) # Add python3 to path 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 -) - -SET(ENV{PATH} "$ENV{PATH};${CURRENT_INSTALLED_DIR}/bin;${CURRENT_INSTALLED_DIR}/debug/bin") +vcpkg_add_to_path(PREPEND ${PYTHON_PATH}) +vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/bin) +vcpkg_add_to_path(${CURRENT_INSTALLED_DIR}/debug/bin) #Store build paths set(DEBUG_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg") @@ -30,6 +24,7 @@ vcpkg_configure_qmake( OPTIONS CONFIG+=build_all CONFIG-=hide_symbols + DEFINES+=SCI_NAMESPACE ) vcpkg_build_qmake( @@ -38,27 +33,27 @@ vcpkg_build_qmake( ) 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 - DESTINATION ${CURRENT_PACKAGES_DIR}/lib - RENAME qscintilla2.lib + ${CURRENT_PACKAGES_DIR}/lib/qscintilla2.lib + COPYONLY ) -file(INSTALL +configure_file( ${DEBUG_DIR}/debug/qscintilla2_qt5.lib - DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib - RENAME qscintilla2.lib + ${CURRENT_PACKAGES_DIR}/debug/lib/qscintilla2.lib + COPYONLY ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(INSTALL + file(COPY ${RELEASE_DIR}/release/qscintilla2_qt5.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin ) - file(INSTALL + file(COPY ${DEBUG_DIR}/debug/qscintilla2_qt5.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin ) |