diff options
| author | flysha <flysha@live.com> | 2017-01-25 10:25:38 +0800 |
|---|---|---|
| committer | flysha <flysha@live.com> | 2017-01-25 10:25:38 +0800 |
| commit | 8fd59c59bcabde5ec79e2fba6ba84a0e96bee462 (patch) | |
| tree | cbcb9db3fd5bde550ccdb0e700f29edfb07891d0 | |
| parent | 033c7d0af6a5f5129e73ebb63b1abea0db128da6 (diff) | |
| download | vcpkg-8fd59c59bcabde5ec79e2fba6ba84a0e96bee462.tar.gz vcpkg-8fd59c59bcabde5ec79e2fba6ba84a0e96bee462.zip | |
[libmariadb] rollback conflict with libmysql
| -rw-r--r-- | ports/libmariadb/portfile.cmake | 8 | ||||
| -rw-r--r-- | ports/libmysql/portfile.cmake | 4 |
2 files changed, 12 insertions, 0 deletions
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)
|