diff options
| author | Hiroshi Miura <miurahr@linux.com> | 2018-08-31 09:07:14 +0900 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-08-30 17:07:14 -0700 |
| commit | ab54bfa0cc98b96a6cffe75e4045ccbd366dbe46 (patch) | |
| tree | a25b3f8c74c876cea9d101eaa65bc256d8057514 /ports | |
| parent | cf1df56e0df7b5a97c30b6a75f910c20d0fb3692 (diff) | |
| download | vcpkg-ab54bfa0cc98b96a6cffe75e4045ccbd366dbe46.tar.gz vcpkg-ab54bfa0cc98b96a6cffe75e4045ccbd366dbe46.zip | |
[vcpkg] post-build cmake test (#3431)
* [vcpkg] post-build cmake test
- test for applications with cmake build system
- Add a test feature to vcpkg core, make progress for #72
- Tests for zlib, bzip2, libiconv and openssl for example
- Test for curl will be failed, because of a bug #3053
It can detect a this type of problems
* [vcpkg_test_cmake] Add MODULE parameter to explicitly specify which type of integration to test.
* [bzip2] Fix casing of cmake module name
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/bzip2/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/curl/portfile.cmake | 7 | ||||
| -rw-r--r-- | ports/libiconv/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/openssl-unix/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/openssl-uwp/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/openssl-windows/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/zlib/portfile.cmake | 2 |
7 files changed, 15 insertions, 4 deletions
diff --git a/ports/bzip2/portfile.cmake b/ports/bzip2/portfile.cmake index ef90e8d98..00d92c90a 100644 --- a/ports/bzip2/portfile.cmake +++ b/ports/bzip2/portfile.cmake @@ -38,3 +38,5 @@ file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/bzip2 file(RENAME ${CURRENT_PACKAGES_DIR}/share/bzip2/LICENSE ${CURRENT_PACKAGES_DIR}/share/bzip2/copyright)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+
+vcpkg_test_cmake(PACKAGE_NAME BZip2 MODULE)
diff --git a/ports/curl/portfile.cmake b/ports/curl/portfile.cmake index cd2ed8b19..f941b11e2 100644 --- a/ports/curl/portfile.cmake +++ b/ports/curl/portfile.cmake @@ -1,14 +1,11 @@ include(vcpkg_common_functions) + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO curl/curl REF curl-7_61_0 SHA512 b6d2f57059e72139540cb93b945703857cb447920ed9b283993611453fed623432290adc5a3558181e3decc15c7cf54fff475010d922957807a37d1a1449be6c HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch ${CMAKE_CURRENT_LIST_DIR}/0002_fix_uwp.patch @@ -135,3 +132,5 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/include/curl/curl.h "${CURL_H}") vcpkg_copy_pdbs() file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +vcpkg_test_cmake(PACKAGE_NAME CURL MODULE) diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake index f1ee147f9..3ccd85c53 100644 --- a/ports/libiconv/portfile.cmake +++ b/ports/libiconv/portfile.cmake @@ -39,3 +39,5 @@ vcpkg_copy_pdbs() # Handle copyright file(COPY ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/libiconv) file(RENAME ${CURRENT_PACKAGES_DIR}/share/libiconv/COPYING.LIB ${CURRENT_PACKAGES_DIR}/share/libiconv/copyright) + +vcpkg_test_cmake(PACKAGE_NAME unofficial-iconv)
\ No newline at end of file diff --git a/ports/openssl-unix/portfile.cmake b/ports/openssl-unix/portfile.cmake index 49561ccde..7bfbb06e5 100644 --- a/ports/openssl-unix/portfile.cmake +++ b/ports/openssl-unix/portfile.cmake @@ -59,3 +59,5 @@ file(INSTALL ${MASTER_COPY_SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_D if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/openssl) endif() + +vcpkg_test_cmake(PACKAGE_NAME OpenSSL MODULE) diff --git a/ports/openssl-uwp/portfile.cmake b/ports/openssl-uwp/portfile.cmake index 167d98658..ef9801380 100644 --- a/ports/openssl-uwp/portfile.cmake +++ b/ports/openssl-uwp/portfile.cmake @@ -88,3 +88,5 @@ file(INSTALL file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +vcpkg_test_cmake(PACKAGE_NAME OpenSSL MODULE) diff --git a/ports/openssl-windows/portfile.cmake b/ports/openssl-windows/portfile.cmake index 22a6a2a28..7c93a5bce 100644 --- a/ports/openssl-windows/portfile.cmake +++ b/ports/openssl-windows/portfile.cmake @@ -155,3 +155,5 @@ vcpkg_copy_pdbs() file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) file(INSTALL ${MASTER_COPY_SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + +vcpkg_test_cmake(PACKAGE_NAME OpenSSL MODULE) diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake index d924e2135..bc36b2781 100644 --- a/ports/zlib/portfile.cmake +++ b/ports/zlib/portfile.cmake @@ -43,3 +43,5 @@ file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DI vcpkg_copy_pdbs() file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +vcpkg_test_cmake(PACKAGE_NAME ZLIB MODULE) |
