diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-12-23 06:10:12 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-23 06:10:12 -0800 |
| commit | c0d22c88ea7638d1b74339f9e9adfd37b0f525ed (patch) | |
| tree | 2475474c4825663531b1e60490d350a85c68a1a5 /ports/qscintilla | |
| parent | 5e88eec627c2e007624f69f34acdaabafa239a0f (diff) | |
| download | vcpkg-c0d22c88ea7638d1b74339f9e9adfd37b0f525ed.tar.gz vcpkg-c0d22c88ea7638d1b74339f9e9adfd37b0f525ed.zip | |
[vcpkg_install_qmake] Add vcpkg_install_qmake (#9412)
* [vcpkg_install_qmake] Add vcpkg_install_qmake and convert existing ports to use it.
[vcpkg_configure_qmake] Add 'staticlib' to CONFIG in static builds
* [vcpkg_configure_qmake] Don't specify DESTDIR
* [libqglviewer][vcpkg_configure_qmake] Add staticlib CONFIG only for libqglviewer
* [qt5-base] Increment version to track changes in vcpkg_configure_qmake()
Diffstat (limited to 'ports/qscintilla')
| -rw-r--r-- | ports/qscintilla/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qscintilla/portfile.cmake | 22 |
2 files changed, 3 insertions, 21 deletions
diff --git a/ports/qscintilla/CONTROL b/ports/qscintilla/CONTROL index 3e8d82c92..de1622354 100644 --- a/ports/qscintilla/CONTROL +++ b/ports/qscintilla/CONTROL @@ -1,5 +1,5 @@ Source: qscintilla -Version: 2.10-9 +Version: 2.10-11 Homepage: https://sourceforge.net/projects/pyqt 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, qt5-macextras (osx), qt5-winextras (windows) diff --git a/ports/qscintilla/portfile.cmake b/ports/qscintilla/portfile.cmake index d979f3135..d34d5517c 100644 --- a/ports/qscintilla/portfile.cmake +++ b/ports/qscintilla/portfile.cmake @@ -19,10 +19,6 @@ 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") -set(RELEASE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel") - vcpkg_configure_qmake( SOURCE_PATH ${SOURCE_PATH}/Qt4Qt5 OPTIONS @@ -32,31 +28,17 @@ vcpkg_configure_qmake( ) if(VCPKG_TARGET_IS_WINDOWS) - vcpkg_build_qmake( + vcpkg_install_qmake( RELEASE_TARGETS release DEBUG_TARGETS debug ) else() - vcpkg_build_qmake() + vcpkg_install_qmake() endif() file(GLOB HEADER_FILES ${SOURCE_PATH}/Qt4Qt5/Qsci/*) file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/Qsci) -if(VCPKG_TARGET_IS_WINDOWS) - configure_file(${RELEASE_DIR}/release/qscintilla2_qt5.lib ${CURRENT_PACKAGES_DIR}/lib/qscintilla2.lib COPYONLY) - configure_file(${DEBUG_DIR}/debug/qscintilla2_qt5.lib ${CURRENT_PACKAGES_DIR}/debug/lib/qscintilla2.lib COPYONLY) - - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(COPY ${RELEASE_DIR}/release/qscintilla2_qt5.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(COPY ${DEBUG_DIR}/debug/qscintilla2_qt5.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - endif() -elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX) - configure_file(${RELEASE_DIR}/libqscintilla2_qt5.a ${CURRENT_PACKAGES_DIR}/lib/libqscintilla2.a COPYONLY) - configure_file(${DEBUG_DIR}/libqscintilla2_qt5.a ${CURRENT_PACKAGES_DIR}/debug/lib/libqscintilla2.a COPYONLY) -endif() - - vcpkg_copy_pdbs() # Handle copyright |