Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[py-qscintilla] Fix build on *-osx-dynamic #33

Merged
merged 5 commits into from
Jun 29, 2024
Merged

[py-qscintilla] Fix build on *-osx-dynamic #33

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
feaec7c
[py-qscintilla] Fix build on *-osx-dynamic
m-kuhn Jun 22, 2024
51c5d1d
Update ports/py-qscintilla/portfile.cmake
m-kuhn Jun 28, 2024
c038f8c
Update ports/py-qscintilla/portfile.cmake
m-kuhn Jun 28, 2024
efc729c
Update portfile.cmake
m-kuhn Jun 28, 2024
c13c1a9
Make python dep explicit
m-kuhn Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ports/py-qscintilla/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ set(SIPBUILD_ARGS
"--qmake" "${CURRENT_INSTALLED_DIR}/tools/Qt6/bin/qmake${VCPKG_HOST_EXECUTABLE_SUFFIX}"
"--api-dir" "${CURRENT_PACKAGES_DIR}/share/Qt6/qsci/api/python"
"--qsci-features-dir" "${SOURCE_PATH}/src/features"
"--qsci-include-dir" "${SITE_PACKAGES}/src"
"--qsci-include-dir" "${CURRENT_INSTALLED_DIR}/${PYTHON3_SITE}/PyQt6/bindings"
"--qsci-library-dir" "${SOURCE_PATH}/src"
"--no-make"
"--verbose"
"--build-dir" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel"
"--target-dir" "${CURRENT_INSTALLED_DIR}/tools/python3/Lib/site-packages/"
"--target-dir" "${CURRENT_INSTALLED_DIR}/${PYTHON3_SITE}"
)

# TODO: help it find sip include dirs, manually patched into sipbuild/project.py for now
# "--sip-include-dirs" "${CURRENT_INSTALLED_DIR}/tools/python3/Lib/site-packages/"
if(DEFINED VCPKG_OSX_DEPLOYMENT_TARGET)
list(APPEND SIPBUILD_ARGS "--qmake-setting" "QMAKE_MACOSX_DEPLOYMENT_TARGET = ${VCPKG_OSX_DEPLOYMENT_TARGET}")
endif()

vcpkg_backup_env_variables(VARS PATH)

Expand Down
1 change: 1 addition & 0 deletions ports/py-qscintilla/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "py-qscintilla",
m-kuhn marked this conversation as resolved.
Show resolved Hide resolved
"version": "2.14.1",
"port-version": 1,
"description": "Python bindings for QScintilla, which 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",
"license": "GPL-3.0-or-later",
Expand Down