diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-08 15:27:59 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-08 15:27:59 -0800 |
| commit | 68d4a4c4bc0309dcac61752a871f84633a211777 (patch) | |
| tree | be450dbab493740a63971b3474963088a033c12a /ports/libmysql | |
| parent | e9ddf167b19fb63dd4defaddcfe4cae2f6c223ca (diff) | |
| parent | dbab03a1a82913ae96bfa3c1613ade20b5ac438d (diff) | |
| download | vcpkg-68d4a4c4bc0309dcac61752a871f84633a211777.tar.gz vcpkg-68d4a4c4bc0309dcac61752a871f84633a211777.zip | |
Merge branch 'master' into ericmitt
Diffstat (limited to 'ports/libmysql')
| -rw-r--r-- | ports/libmysql/portfile.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake index 9c2aafdc1..48412ccc7 100644 --- a/ports/libmysql/portfile.cmake +++ b/ports/libmysql/portfile.cmake @@ -1,6 +1,6 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - message(FATAL_ERROR "Static building not supported yet") + message(STATUS "Warning: Static building not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) endif() include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mysql-server-mysql-5.7.16) @@ -18,7 +18,7 @@ vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} - PATCHES + PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch ) @@ -29,11 +29,11 @@ vcpkg_configure_cmake( vcpkg_install_cmake() # delete debug headers -file(REMOVE_RECURSE +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # delete useless vcruntime/scripts/bin/msg file -file(REMOVE_RECURSE +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share ${CURRENT_PACKAGES_DIR}/debug/share ${CURRENT_PACKAGES_DIR}/bin |