diff options
| author | JackBoosY <yuzaiyang@beyondsoft.com> | 2020-01-13 23:55:59 -0800 |
|---|---|---|
| committer | JackBoosY <yuzaiyang@beyondsoft.com> | 2020-01-13 23:55:59 -0800 |
| commit | 2514481b42ebdeec28649582fc666955cf206c84 (patch) | |
| tree | 60c9809a5c3c8adbad240a40b1088a6f8e42c019 /ports/qcustomplot | |
| parent | b751326c91c9a307aaf5e340b61ab9f2d1ad45a4 (diff) | |
| parent | 28eee51adb36f2165be846e77ef7b3ee5b3f8789 (diff) | |
| download | vcpkg-2514481b42ebdeec28649582fc666955cf206c84.tar.gz vcpkg-2514481b42ebdeec28649582fc666955cf206c84.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/jack/upgrade_libi
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
|