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/qcustomplot | |
| 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/qcustomplot')
| -rw-r--r-- | ports/qcustomplot/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qcustomplot/portfile.cmake | 32 |
2 files changed, 2 insertions, 32 deletions
diff --git a/ports/qcustomplot/CONTROL b/ports/qcustomplot/CONTROL index 4b8223844..90eb89b22 100644 --- a/ports/qcustomplot/CONTROL +++ b/ports/qcustomplot/CONTROL @@ -1,4 +1,4 @@ Source: qcustomplot
-Version: 2.0.1-1
+Version: 2.0.1-3
Description: QCustomPlot is a Qt C++ widget for plotting and data visualization.
Build-Depends: qt5-base
diff --git a/ports/qcustomplot/portfile.cmake b/ports/qcustomplot/portfile.cmake index d35c67d01..ba153e79a 100644 --- a/ports/qcustomplot/portfile.cmake +++ b/ports/qcustomplot/portfile.cmake @@ -24,46 +24,16 @@ vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH}/qcustomplot-sharedlib/sharedlib-compilation/sharedlib-compilation.pro
)
-vcpkg_build_qmake(
+vcpkg_install_qmake(
RELEASE_TARGETS release-all
DEBUG_TARGETS debug-all
)
-set(DEBUG_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
-set(RELEASE_DIR "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
-
# Install header file
file(INSTALL ${SOURCE_PATH}/qcustomplot.h
DESTINATION ${CURRENT_PACKAGES_DIR}/include
)
-# Install module files
-macro(_install_module_file source_dir target_dir filename_regex)
- file(GLOB _files ${source_dir}/*)
- list(FILTER _files INCLUDE REGEX ${filename_regex})
- file(INSTALL ${_files} DESTINATION ${target_dir})
-endmacro()
-
-_install_module_file(${DEBUG_DIR}/debug
- ${CURRENT_PACKAGES_DIR}/debug/lib
- "qcustomplotd[2]*\.(lib|a)$")
-
-_install_module_file(${RELEASE_DIR}/release
- ${CURRENT_PACKAGES_DIR}/lib
- "qcustomplot[2]*\.(lib|a)$")
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
- file(INSTALL
- ${DEBUG_DIR}/debug/qcustomplotd2.dll
- DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
- )
-
- file(INSTALL
- ${RELEASE_DIR}/release/qcustomplot2.dll
- DESTINATION ${CURRENT_PACKAGES_DIR}/bin
- )
-endif()
-
vcpkg_copy_pdbs()
# Handle copyright
|