From 764ed56a9fdfedcdac0a06fd3306d49e6660bdb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 19 May 2021 06:40:50 +0800 Subject: [qscintilla] Modify macro QSCINTILLA_DLL to 1 in qscintilla header (#17721) * [qscintilla] Modify macro QSCINTILLA_DLL to 1 in qscintilla header when building dynamic on Windows * Move code pos * update version record --- ports/qscintilla/CONTROL | 5 ----- ports/qscintilla/portfile.cmake | 7 +++++++ ports/qscintilla/vcpkg.json | 22 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 5 deletions(-) delete mode 100644 ports/qscintilla/CONTROL create mode 100644 ports/qscintilla/vcpkg.json (limited to 'ports') diff --git a/ports/qscintilla/CONTROL b/ports/qscintilla/CONTROL deleted file mode 100644 index 2a4990eb0..000000000 --- a/ports/qscintilla/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: qscintilla -Version: 2.12.0 -Homepage: https://www.riverbankcomputing.com/software/qscintilla -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[core], qt5-macextras (osx), qt5-winextras (windows) \ No newline at end of file diff --git a/ports/qscintilla/portfile.cmake b/ports/qscintilla/portfile.cmake index 11fd204de..e239dcc37 100644 --- a/ports/qscintilla/portfile.cmake +++ b/ports/qscintilla/portfile.cmake @@ -37,6 +37,13 @@ endif() file(GLOB HEADER_FILES ${SOURCE_PATH}/src/Qsci/*) file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/Qsci) +if (VCPKG_TARGET_IS_WINDOWS AND (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)) + vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/Qsci/qsciglobal.h + "#if defined(QSCINTILLA_DLL)" + "#if 1" + ) +endif() + vcpkg_copy_pdbs() # Handle copyright diff --git a/ports/qscintilla/vcpkg.json b/ports/qscintilla/vcpkg.json new file mode 100644 index 000000000..8e822764c --- /dev/null +++ b/ports/qscintilla/vcpkg.json @@ -0,0 +1,22 @@ +{ + "name": "qscintilla", + "version": "2.12.0", + "port-version": 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)", + "homepage": "https://www.riverbankcomputing.com/software/qscintilla", + "supports": "!(windows & (arm | arm64))", + "dependencies": [ + { + "name": "qt5-base", + "default-features": false + }, + { + "name": "qt5-macextras", + "platform": "osx" + }, + { + "name": "qt5-winextras", + "platform": "windows" + } + ] +} -- cgit v1.2.3