From 8fd59c59bcabde5ec79e2fba6ba84a0e96bee462 Mon Sep 17 00:00:00 2001 From: flysha Date: Wed, 25 Jan 2017 10:25:38 +0800 Subject: [libmariadb] rollback conflict with libmysql --- ports/libmariadb/portfile.cmake | 8 ++++++++ ports/libmysql/portfile.cmake | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake index ebca3d7f3..3dba9c7d1 100644 --- a/ports/libmariadb/portfile.cmake +++ b/ports/libmariadb/portfile.cmake @@ -1,3 +1,8 @@ + +if (EXISTS "${CURRENT_INSTALLED_DIR}/include/mysql/mysql.h") + message(FATAL_ERROR "FATAL ERROR: libmysql and libmariadb are incompatible.") +endif() + include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mariadb-connector-c-2.3.2) @@ -57,6 +62,9 @@ file(REMOVE ${CURRENT_PACKAGES_DIR}/include/mariadb/mysql_version.h.in ${CURRENT_PACKAGES_DIR}/include/mariadb/CMakeLists.txt ${CURRENT_PACKAGES_DIR}/include/mariadb/Makefile.am) +file(RENAME + ${CURRENT_PACKAGES_DIR}/include/mariadb + ${CURRENT_PACKAGES_DIR}/include/mysql) # copy license file file(COPY ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmariadb) diff --git a/ports/libmysql/portfile.cmake b/ports/libmysql/portfile.cmake index 592482544..4d711fef5 100644 --- a/ports/libmysql/portfile.cmake +++ b/ports/libmysql/portfile.cmake @@ -1,3 +1,7 @@ +if (EXISTS "${CURRENT_INSTALLED_DIR}/include/mysql/mysql.h") + message(FATAL_ERROR "FATAL ERROR: libmysql and libmariadb are incompatible.") +endif() + include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mysql-server-mysql-5.7.17) -- cgit v1.2.3