diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-08 14:25:47 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-08 14:25:47 -0800 |
| commit | 1808d461b0e8793445b87eb8ceed71d5ac7aca6e (patch) | |
| tree | 457ed603532038436d92a996afe7b4bdaef78daf /ports/libmariadb | |
| parent | 6e9d17f73c01c3ad07875ca79196ed2f5e2d3896 (diff) | |
| download | vcpkg-1808d461b0e8793445b87eb8ceed71d5ac7aca6e.tar.gz vcpkg-1808d461b0e8793445b87eb8ceed71d5ac7aca6e.zip | |
triplet is now automatically included before portfiles.
Also remove trailing whitespaces from portfiles
Diffstat (limited to 'ports/libmariadb')
| -rw-r--r-- | ports/libmariadb/portfile.cmake | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index ab40ab5c9..61e2ccee5 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -1,4 +1,3 @@ -include(${CMAKE_TRIPLET_FILE}) if (VCPKG_LIBRARY_LINKAGE STREQUAL static) message(FATAL_ERROR "Static building not supported yet") endif() @@ -26,27 +25,27 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # fix libmariadb lib & dll directory. -file(MAKE_DIRECTORY +file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/mariadb/libmariadb.dll +file(RENAME + ${CURRENT_PACKAGES_DIR}/lib/mariadb/libmariadb.dll ${CURRENT_PACKAGES_DIR}/bin/libmariadb.dll) -file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/libmariadb.dll +file(RENAME + ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/libmariadb.dll ${CURRENT_PACKAGES_DIR}/debug/bin/libmariadb.dll) -file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/mariadb/libmariadb.lib +file(RENAME + ${CURRENT_PACKAGES_DIR}/lib/mariadb/libmariadb.lib ${CURRENT_PACKAGES_DIR}/lib/libmariadb.lib) -file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/libmariadb.lib +file(RENAME + ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/libmariadb.lib ${CURRENT_PACKAGES_DIR}/debug/lib/libmariadb.lib) -file(REMOVE +file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/mariadb/mariadbclient.lib ${CURRENT_PACKAGES_DIR}/debug/lib/mariadb/mariadbclient.lib) # remove plugin folder -file(REMOVE_RECURSE +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/plugin ${CURRENT_PACKAGES_DIR}/debug/lib/plugin ${CURRENT_PACKAGES_DIR}/lib/mariadb |