diff options
| author | Shinya Onogi <shinya.onogi.1979@ieee.org> | 2017-10-21 19:29:40 +0900 |
|---|---|---|
| committer | Shinya Onogi <shinya.onogi.1979@ieee.org> | 2017-10-21 19:29:40 +0900 |
| commit | 2e39b6195fbc14a655474b019234890df94a2ed0 (patch) | |
| tree | b6c2c3362a39d24d7fb60da44ebabd9f37bff7a9 | |
| parent | c37124be6348fafae5fb0722702bbb47ef20f252 (diff) | |
| parent | 6eebc16c9c2be9ba3bd4fe4a01998cf6a05050db (diff) | |
| download | vcpkg-2e39b6195fbc14a655474b019234890df94a2ed0.tar.gz vcpkg-2e39b6195fbc14a655474b019234890df94a2ed0.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg
| -rw-r--r-- | ports/libmariadb/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libmariadb/portfile.cmake | 12 | ||||
| -rw-r--r-- | ports/pugixml/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pugixml/portfile.cmake | 27 |
4 files changed, 26 insertions, 17 deletions
diff --git a/ports/libmariadb/CONTROL b/ports/libmariadb/CONTROL index 89f5647a7..b9cfcbbef 100644 --- a/ports/libmariadb/CONTROL +++ b/ports/libmariadb/CONTROL @@ -1,3 +1,3 @@ Source: libmariadb
-Version: 2.3.2-1
+Version: 3.0.2
Description: MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases
diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index 3dba9c7d1..3aca7afb3 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -4,17 +4,21 @@ if (EXISTS "${CURRENT_INSTALLED_DIR}/include/mysql/mysql.h") endif()
include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mariadb-connector-c-2.3.2)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mariadb-connector-c-3.0.2)
vcpkg_download_distfile(ARCHIVE
- URLS "https://github.com/MariaDB/mariadb-connector-c/archive/v2.3.2.tar.gz"
- FILENAME "mariadb-connector-c-2.3.2.tar.gz"
- SHA512 f5574756ffce69e3dd15b7f7c14cfd0b4d69e3203ae4b383f05a110918916279ba7c0b9149d0dcb9ec93bbfc0927dfaf88bb40979ba1de710ce148d1fbe033af
+ URLS "https://github.com/MariaDB/mariadb-connector-c/archive/v3.0.2.tar.gz"
+ FILENAME "mariadb-connector-c-3.0.2.tar.gz"
+ SHA512 a5086ff149b1ca0e1b652013475c5f3793824416a60ec35018b6dcd502bd38b50fa040271ff8d308520dadecc9601671fccf67046fcda2425f1d7c59e1c6c52f
)
vcpkg_extract_source_archive(${ARCHIVE})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
+ OPTIONS
+ -DWITH_UNITTEST=OFF
+ -DWITH_SSL=OFF
+ -DWITH_CURL=OFF
)
vcpkg_install_cmake()
diff --git a/ports/pugixml/CONTROL b/ports/pugixml/CONTROL index 5fc5f1e4e..01679ea6e 100644 --- a/ports/pugixml/CONTROL +++ b/ports/pugixml/CONTROL @@ -1,3 +1,3 @@ Source: pugixml -Version: 1.8.1-1 +Version: 1.8.1-2 Description: C++ XML processing library diff --git a/ports/pugixml/portfile.cmake b/ports/pugixml/portfile.cmake index 4fcbec84b..0d5123974 100644 --- a/ports/pugixml/portfile.cmake +++ b/ports/pugixml/portfile.cmake @@ -7,17 +7,22 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/pugixmlapi.patch -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - -DBUILD_DEFINES="PUGIXML_API=__declspec\(dllexport\)" -) +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + ) +else() + vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/pugixmlapi.patch + ) + vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBUILD_DEFINES="PUGIXML_API=__declspec\(dllexport\)" + ) +endif() vcpkg_install_cmake() vcpkg_copy_pdbs() |